/ QGIS Public
Show file tree
Hide file tree
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into dbl
Conflicts: images/splash/splash.png src/CMakeLists.txt src/app/main.cpp src/app/qgsvectorlayerproperties.cpp src/core/qgsvectorlayer.cpp src/providers/wms/qgswmssourceselect.cpp
- Loading branch information
Showing 329 changed files with 10,168 additions and 10,712 deletions.