Skip to content
Permalink
Browse files

merge from trunk r11000:11050

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11134 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder
wonder committed Jul 21, 2009
1 parent 386d5c4 commit c03425daf4dae071eb2a69d1ca5b574530038640
Showing with 19,965 additions and 10,003 deletions.
  1. +1 −0 AUTHORS
  2. +1 −1 CMakeLists.txt
  3. +22 −19 DONORS
  4. +214 −234 i18n/qgis_de.ts
  5. +749 −0 images/icons/qgis_icon_new.svg
  6. +358 −34 mac/xcode/Qgis.xcodeproj/project.pbxproj
  7. +14 −0 python/core/qgsapplication.sip
  8. +12 −0 python/core/qgsvectorlayer.sip
  9. +3 −3 src/app/attributetable/qgsattributetablemodel.cpp
  10. +1 −0 src/app/composer/qgscomposerpicturewidget.cpp
  11. +3 −10 src/app/legend/qgslegend.cpp
  12. +4 −5 src/app/legend/qgslegendlayer.cpp
  13. +5 −0 src/app/main.cpp
  14. +51 −3 src/app/qgsabout.cpp
  15. +1 −1 src/app/qgsattributedialog.cpp
  16. +3 −22 src/app/qgscontinuouscolordialog.cpp
  17. +1 −0 src/app/qgsdbsourceselect.cpp
  18. +15 −50 src/app/qgsgraduatedsymboldialog.cpp
  19. +1 −1 src/app/qgsmaptoolidentify.cpp
  20. +5 −1 src/app/qgsmaptoolsimplify.cpp
  21. +6 −1 src/app/qgsnewconnection.cpp
  22. +1 −0 src/app/qgsnewconnection.h
  23. +1 −0 src/app/qgssinglesymboldialog.cpp
  24. +6 −6 src/app/qgsuniquevaluedialog.cpp
  25. +10 −10 src/app/qgsvectorlayerproperties.cpp
  26. +1 −1 src/app/qgsvectorlayerproperties.h
  27. +7 −0 src/core/CMakeLists.txt
  28. +1 −1 src/core/composer/qgslegendmodel.cpp
  29. +9 −0 src/core/qgsapplication.cpp
  30. +6 −1 src/core/qgsapplication.h
  31. +3 −3 src/core/qgsvectorlayer.h
  32. +2 −0 src/core/spatialite/headers/spatialite/gaiaexif.h
  33. +2 −2 src/core/spatialite/headers/spatialite/gaiageo.h
  34. +896 −763 src/core/spatialite/headers/spatialite/sqlite3.h
  35. +160 −203 src/core/spatialite/headers/spatialite/sqlite3ext.h
  36. +6,721 −262 src/core/spatialite/spatialite.c
  37. +9,529 −7,297 src/core/spatialite/sqlite3.c
  38. +28 −28 src/plugins/evis/databaseconnection/evisdatabaseconnection.cpp
  39. +92 −92 src/plugins/evis/databaseconnection/evisdatabaseconnection.h
  40. +89 −88 src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp
  41. +17 −17 src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.h
  42. +15 −15 src/plugins/evis/databaseconnection/evisdatabaselayerfieldselectiongui.cpp
  43. +22 −22 src/plugins/evis/databaseconnection/evisdatabaselayerfieldselectiongui.h
  44. +9 −9 src/plugins/evis/databaseconnection/evisquerydefinition.cpp
  45. +82 −82 src/plugins/evis/databaseconnection/evisquerydefinition.h
  46. +19 −19 src/plugins/evis/eventbrowser/evisconfiguration.cpp
  47. +17 −17 src/plugins/evis/eventbrowser/evisconfiguration.h
  48. +183 −230 src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp
  49. +104 −104 src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.h
  50. +30 −30 src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp
  51. +75 −75 src/plugins/evis/eventbrowser/evisimagedisplaywidget.h
  52. +24 −24 src/plugins/evis/evis.cpp
  53. +43 −43 src/plugins/evis/evis.h
  54. +18 −18 src/plugins/evis/idtool/eviseventidtool.cpp
  55. +20 −20 src/plugins/evis/idtool/eviseventidtool.h
  56. +2 −2 src/plugins/evis/ui/evisdatabaseconnectionguibase.ui
  57. +4 −4 src/plugins/evis/ui/evisgenericeventbrowserguibase.ui
  58. +0 −11 src/plugins/grass/CMakeLists.txt
  59. +1 −0 src/plugins/grass/modules-6.4/default.qgc
  60. BIN src/plugins/grass/modules-6.4/qgis.r.external.all.1.png
  61. +9 −0 src/plugins/grass/modules-6.4/qgis.r.external.all.qgm
  62. +10 −0 src/plugins/grass/qgsgrassmodule.cpp
  63. +1 −1 src/plugins/grass/qgsgrassmodule.h
  64. +84 −0 src/plugins/grass/scripts/qgis.r.external.all.py
  65. +0 −12 src/providers/grass/CMakeLists.txt
  66. +130 −94 src/ui/qgsabout.ui
  67. +8 −11 src/ui/qgscomposerpicturewidgetbase.ui
  68. +4 −1 src/ui/qgssinglesymboldialogbase.ui
@@ -37,3 +37,4 @@ Peter Ersts <ersts at amnh.org>
Borys Jurgiel <borysiasty at aster.pl>
Paolo Cavallini <cavallini at faunalia.it>
Carson J. Q. Farmer <carson dot farmer at gmail dot com>
Lorenzo Masini <lorenxo86@gmail.com>
@@ -384,7 +384,7 @@ ENDIF (ENABLE_TESTS)
#############################################################
# install stuff

INSTALL (FILES AUTHORS SPONSORS TRANSLATORS INSTALL CODING
INSTALL (FILES AUTHORS SPONSORS DONORS TRANSLATORS INSTALL CODING
DESTINATION ${QGIS_DATA_DIR}/doc)

# manual page - makes sense only on unix systems
41 DONORS
@@ -12,50 +12,53 @@
#
# ALWAYS USE UTF-8 WHEN WRITING THIS FILE!
#
Aaron Racicot, Ecotrust|www.ecotrust.org
Aaron Racicot, Ecotrust|http://www.ecotrust.org/
Adam Lane
Albin Blaschka|www.albinblaschka.info
Alessandro Pasotti|www.itopen.it
Albin Blaschka|http://www.albinblaschka.info/
Alessandro Pasotti|http://www.itopen.it/
Alessandro Sarretta
Alexandre Leroux
Associazione Monte Porzio Cultura
Carl Nelson
D R Arbib|Unknown
David Enns|www.mapitout.com
Ecotrust|www.ecotrust.org
D R Arbib
David Enns|http://www.mapitout.com/
Ecotrust|http://www.ecotrust.org/
Ferdinando Urbano
Flavio Rigolon
Fred Watchorn
Glasic S.r.l.|www.glasic.it
Ivan Marchesini|www.gfosservices.it
Glasic S.r.l.|http://www.glasic.it/
Ivan Marchesini|http://www.gfosservices.it/
James Crone
Jaroslaw Kowalczyk
Jason Jorgenson
John C. Tull
Kanton Solothurn|SOGIS
Kanton Solothurn SOGIS
Kevin Shook
Laura Burnette
Lorenzo Becchi|ominiverdi.org
Lorenzo Becchi|http://ominiverdi.org/
Luca Casagrande
Maciej Sieczka
Maria Antonia Brovelli
Marc Monnerat
Massimo Cuomo|www.acsys.it
Mateusz Loskot|mateusz.loskot.net
Massimo Cuomo|http://www.acsys.it/
Mateusz Loskot|http://mateusz.loskot.net/
Matt Wilkie
Niccolo Rigacci|www.rigacci.org
Niccolo Rigacci|http://www.rigacci.org/
Nikolaos Alexandris
Otto Dassau
Paolo Cavallini|www.faunalia.it
Paolo Cavallini|www.gfoss.it
Paolo Cavallini|http://www.faunalia.it/
Paolo Cavallini|http://www.gfoss.it/
Patti Giuseppe
Planetek Italia s.r.l|www.planetek.it
Ragnvald Larsen|www.mindland.com
Planetek Italia s.r.l|http://www.planetek.it/
Radoslaw Pasiok
Ragnvald Larsen|http://www.mindland.com/
Raymond Warriner
Silvio Grosso
Stefano Menegon|www.mpasol.it
Stefano Menegon|http://www.mpasol.it/
Stephan Holl
Sti Sas Di Meo
Thierry Gonon
Tim Baggett
Tishampati Dhar
Tyler Mitchell|spatialguru.com
Tyler Mitchell|http://spatialguru.com/
Yves Jacolin

Large diffs are not rendered by default.

0 comments on commit c03425d

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