Martin Dobias b20619623f 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
2011-05-13 22:20:43 +02:00
..
2011-03-02 10:16:18 +00:00
2011-05-13 22:20:43 +02:00
2011-05-13 22:20:43 +02:00
2011-05-13 22:20:43 +02:00