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

…s_to_db Conflicts: src/ui/qgsvectorlayerpropertiesbase.ui
qgis · Apr 22, 2013 · b4b779c · b4b779c
2 parents ea382d1 + 1a91841
commit b4b779c
Show file tree

Hide file tree

Showing 1,323 changed files with 758,089 additions and 395,413 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,6 +41,7 @@ doc/INSTALL.tex
 scripts/Debug
 scripts/RelWithDebInfo
 /CMakeLists.txt.user
+/CMakeLists.txt.user.*
 qgis-test.ctest
 i18n/*.qm
 .project

diff --git a/cmake_templates/Doxyfile.in b/cmake_templates/Doxyfile.in
@@ -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 \

diff --git a/doc/AUTHORS b/doc/AUTHORS
@@ -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>
diff --git a/doc/TRANSLATORS b/doc/TRANSLATORS
diff --git a/i18n/qgis_af.ts b/i18n/qgis_af.ts
diff --git a/i18n/qgis_ar.ts b/i18n/qgis_ar.ts
diff --git a/i18n/qgis_bg.ts b/i18n/qgis_bg.ts
diff --git a/i18n/qgis_bs_BA.ts b/i18n/qgis_bs_BA.ts
diff --git a/i18n/qgis_ca_ES.ts b/i18n/qgis_ca_ES.ts
diff --git a/i18n/qgis_cs_CZ.ts b/i18n/qgis_cs_CZ.ts
diff --git a/i18n/qgis_da_DK.ts b/i18n/qgis_da_DK.ts
diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts
diff --git a/i18n/qgis_el_GR.ts b/i18n/qgis_el_GR.ts
diff --git a/i18n/qgis_en.ts b/i18n/qgis_en.ts