mirror of
https://github.com/qgis/QGIS.git
synced 2025-02-25 00:58:06 -05:00
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