Skip to content

Commit

Permalink
Merge branch 'master' into dbl
Browse files Browse the repository at this point in the history 
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
@wonder-sk
wonder-sk committed May 13, 2011
2 parents 153ad16 + 3ec8059 commit b206196
Show file tree
Hide file tree
Showing 329 changed files with 10,168 additions and 10,712 deletions.