Skip to content
Permalink
Browse files

Merge branch 'master' of git://github.com/qgis/Quantum-GIS into style…

…s_to_db

Conflicts:
	src/ui/qgsvectorlayerpropertiesbase.ui
  • Loading branch information
Emilio Loi
Emilio Loi committed Apr 22, 2013
2 parents ea382d1 + 1a91841 commit b4b779cdf40287ff824689b85ef8db2acf65bda9
Showing 1,323 changed files with 758,089 additions and 395,413 deletions.
@@ -41,6 +41,7 @@ doc/INSTALL.tex
scripts/Debug
scripts/RelWithDebInfo
/CMakeLists.txt.user
/CMakeLists.txt.user.*
qgis-test.ctest
i18n/*.qm
.project
@@ -596,8 +596,6 @@ INPUT = @CMAKE_SOURCE_DIR@/doc \
@CMAKE_SOURCE_DIR@/src/core \
@CMAKE_SOURCE_DIR@/src/core/composer \
@CMAKE_SOURCE_DIR@/src/core/raster \
@CMAKE_SOURCE_DIR@/src/core/renderer \
@CMAKE_SOURCE_DIR@/src/core/symbology \
@CMAKE_SOURCE_DIR@/src/core/symbology-ng \
@CMAKE_SOURCE_DIR@/src/core/gps \
@CMAKE_SOURCE_DIR@/src/gui \
@@ -50,3 +50,6 @@ Etienne Tourigny <etourigny.dev at gmail.com>
Larry Shaffer <larrys at dakotacarto.com>
Victor Olaya <volayaf at gmail.com>
Dave DeHaan <dave.dehaan@sap.com>
Matthias Kuhn <matthias.kuhn at gmx.ch>
Salvatore Larosa <lrssvtml at gmail.com>
Nyall Dawson <nyall.dawson at gmail.com>

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

0 comments on commit b4b779c

Please sign in to comment.
You can’t perform that action at this time.