Merge with master

qgis · Apr 23, 2013 · d835194 · d835194
2 parents 02388fe + 1176bbc
commit d835194
Show file tree

Hide file tree

Showing 177 changed files with 67,593 additions and 11,806 deletions.
diff --git a/doc/TRANSLATORS b/doc/TRANSLATORS
diff --git a/i18n/qgis_bs_BA.ts b/i18n/qgis_bs_BA.ts
diff --git a/i18n/qgis_cs_CZ.ts b/i18n/qgis_cs_CZ.ts
diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts
diff --git a/i18n/qgis_zh_CN.ts b/i18n/qgis_zh_CN.ts
diff --git a/images/flags/bs_BA.png b/images/flags/bs_BA.png
diff --git a/images/images.qrc b/images/images.qrc
@@ -95,6 +95,10 @@
         <file>themes/default/console/iconRunScriptConsole.png</file>
         <file>themes/default/console/iconCommentEditorConsole.png</file>
         <file>themes/default/console/iconUncommentEditorConsole.png</file>
+        <file>themes/default/console/iconClassTreeWidgetConsole.png</file>
+        <file>themes/default/console/iconMethodTreeWidgetConsole.png</file>
+        <file>themes/default/console/iconFunctionTreeWidgetConsole.png</file>
+        <file>themes/default/console/iconClassBrowserConsole.png</file>
         <file>themes/default/extents.png</file>
         <file>themes/default/favourites.png</file>
         <file>themes/default/geographic.png</file>
@@ -370,14 +374,17 @@
         <file>themes/default/propertyicons/CRS.png</file>
         <file>themes/default/propertyicons/diagram.png</file>
         <file>themes/default/propertyicons/digitising.png</file>
+        <file>themes/default/propertyicons/display.svg</file>
         <file>themes/default/propertyicons/gdal.png</file>
         <file>themes/default/propertyicons/general.png</file>
         <file>themes/default/propertyicons/histogram.png</file>
         <file>themes/default/propertyicons/join.png</file>
         <file>themes/default/propertyicons/labels.png</file>
+        <file>themes/default/propertyicons/labels.svg</file>
         <file>themes/default/propertyicons/locale.png</file>
         <file>themes/default/propertyicons/map_tools.png</file>
         <file>themes/default/propertyicons/metadata.png</file>
+        <file>themes/default/propertyicons/metadata.svg</file>
         <file>themes/default/propertyicons/network_and_proxy.png</file>
         <file>themes/default/propertyicons/overlay.png</file>
         <file>themes/default/propertyicons/pyramids.png</file>
@@ -403,6 +410,7 @@
         <file>themes/default/transp-background_8x8.png</file>
         <file>themes/default/unlocked.png</file>
         <file>themes/default/user.png</file>
+        <file>flags/bs_BA.png</file>
     </qresource>
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

diff --git a/images/themes/default/console/iconClassBrowserConsole.png b/images/themes/default/console/iconClassBrowserConsole.png
diff --git a/images/themes/default/console/iconClassTreeWidgetConsole.png b/images/themes/default/console/iconClassTreeWidgetConsole.png
diff --git a/images/themes/default/console/iconFunctionTreeWidgetConsole.png b/images/themes/default/console/iconFunctionTreeWidgetConsole.png
diff --git a/images/themes/default/console/iconMethodTreeWidgetConsole.png b/images/themes/default/console/iconMethodTreeWidgetConsole.png
diff --git a/images/themes/default/propertyicons/display.svg b/images/themes/default/propertyicons/display.svg
diff --git a/images/themes/default/propertyicons/labels.svg b/images/themes/default/propertyicons/labels.svg
diff --git a/images/themes/default/propertyicons/metadata.svg b/images/themes/default/propertyicons/metadata.svg
diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd
@@ -13,7 +13,7 @@ REM *   (at your option) any later version.                                   *
 REM *                                                                         *
 REM ***************************************************************************
 @echo off
-set GRASS_VERSION=6.4.3RC2
+set GRASS_VERSION=6.4.3RC3
 
 set BUILDDIR=%CD%\build
 REM set BUILDDIR=%TEMP%\qgis_unstable

diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -13,7 +13,7 @@ REM *   (at your option) any later version.                                   *
 REM *                                                                         *
 REM ***************************************************************************
 @echo off
-set GRASS_VERSION=6.4.3RC2
+set GRASS_VERSION=6.4.3RC3
 
 set BUILDDIR=%CD%\build
 REM set BUILDDIR=%TEMP%\qgis_unstable