merge from trunk r10950:11000

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11133 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jul 21, 2009 · 386d5c4 · 386d5c4
1 parent c1379b5
commit 386d5c4
Show file tree

Hide file tree

Showing 141 changed files with 166,856 additions and 118,037 deletions.
diff --git a/debian/qgis.install b/debian/qgis.install
@@ -22,6 +22,7 @@ usr/lib/qgis/libcoordinatecaptureplugin.so
 usr/lib/qgis/libspatialiteprovider.so
 usr/lib/qgis/liboracleplugin.so
 usr/lib/qgis/libdiagramoverlay.so 
+usr/lib/qgis/libevis.so 
 usr/share/pixmaps/qgis-icon.xpm
 usr/share/pixmaps/qgis-mime-icon.png
 usr/share/pixmaps/qgis-mime-icon.png usr/share/icons/crystalsvg/128x128/mimetypes

diff --git a/i18n/qgis_ar.ts b/i18n/qgis_ar.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_el_GR.ts b/i18n/qgis_el_GR.ts
diff --git a/i18n/qgis_es.ts b/i18n/qgis_es.ts
diff --git a/i18n/qgis_fr.ts b/i18n/qgis_fr.ts
diff --git a/i18n/qgis_he.ts b/i18n/qgis_he.ts
diff --git a/i18n/qgis_hu.ts b/i18n/qgis_hu.ts