Merge branch 'master' into daniviga-2.18

This commit is contained in:
2016-10-27 19:26:56 +02:00
4 changed files with 32 additions and 6 deletions

1
.gitignore vendored
View File

@@ -27,3 +27,4 @@ qgis_1.5.0.tar.gz
/qgis-2.16.1.tar.bz2
/qgis-2.16.2.tar.bz2
/qgis-2.16.3.tar.bz2
/qgis-2.18.0.tar.bz2