Merge branch 'master' into daniviga-2.18

This commit is contained in:
2016-12-23 09:03:44 +01:00
3 changed files with 18 additions and 10 deletions

2
.gitignore vendored
View File

@@ -28,3 +28,5 @@ qgis_1.5.0.tar.gz
/qgis-2.16.2.tar.bz2
/qgis-2.16.3.tar.bz2
/qgis-2.18.0.tar.bz2
/qgis-2.18.1.tar.bz2
/qgis-2.18.2.tar.bz2