/ QGIS Public
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:qgis/qgis
Conflicts: README git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14888 c8812cc2-4d05-0410-92ff-de0c093fc19c
- Loading branch information
Showing 1 changed file with 9 additions and 4 deletions.