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

…les_to_db
qgis · May 2, 2013 · 764afb8 · 764afb8
2 parents db3bfa3 + c3df3ba
commit 764afb8
Show file tree

Hide file tree

Showing 473 changed files with 20,186 additions and 60,512 deletions.
diff --git a/doc/AUTHORS b/doc/AUTHORS
@@ -53,4 +53,4 @@ 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>
-Vinayan Parameswaran  <vinayan123 at gmail dot com>
+Vinayan Parameswaran	<vinayan123 at gmail dot com>
diff --git a/doc/TRANSLATORS b/doc/TRANSLATORS
diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts
diff --git a/images/svg/CMakeLists.txt b/images/svg/CMakeLists.txt
@@ -1,9 +1,11 @@
 
-SET (SVG_DIRS 
+SET (SVG_DIRS
  accommodation
  amenity
- biology
- biology  
+ arrows
+ backgrounds
+ components
+ crosses
  emergency
  entertainment
  food
@@ -13,14 +15,14 @@ SET (SVG_DIRS
  icon
  landmark
  money
- north_arrows
  religion
  services
  shopping
  sport
  symbol
  tourist
  transport
+ wind_roses
 )
 
 

diff --git a/images/svg/accommodation/accommodation_alpinehut.svg b/images/svg/accommodation/accommodation_alpinehut.svg