Skip to content
Permalink
Browse files

merge from trunk r11900:11950

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11969 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder
wonder committed Nov 7, 2009
1 parent 97a84db commit be961f33e379ec88a1c02c3a0741e7a8b4c1fa7e
Showing with 89,182 additions and 63,857 deletions.
  1. +2 −0 DONORS
  2. +5 −5 debian/control
  3. +2,711 −2,552 i18n/qgis_ar.ts
  4. +3,170 −2,168 i18n/qgis_cs_CZ.ts
  5. +957 −737 i18n/qgis_de.ts
  6. +2,699 −2,581 i18n/qgis_el_GR.ts
  7. +3,318 −2,092 i18n/qgis_es.ts
  8. +3,258 −2,045 i18n/qgis_fr.ts
  9. +2,709 −2,600 i18n/qgis_he.ts
  10. +3,234 −2,142 i18n/qgis_hu.ts
  11. +2,835 −2,463 i18n/qgis_id.ts
  12. +3,290 −2,092 i18n/qgis_it.ts
  13. +2,901 −2,406 i18n/qgis_ja.ts
  14. +3,205 −2,157 i18n/qgis_ka_GE.ts
  15. +2,917 −2,330 i18n/qgis_lo.ts
  16. +2,703 −2,566 i18n/qgis_lt.ts
  17. +3,258 −2,099 i18n/qgis_lv.ts
  18. +2,923 −2,380 i18n/qgis_mn.ts
  19. +3,380 −2,106 i18n/qgis_nl.ts
  20. +3,324 −2,069 i18n/qgis_pl_PL.ts
  21. +3,244 −2,129 i18n/qgis_pt_BR.ts
  22. +2,796 −2,425 i18n/qgis_ro.ts
  23. +3,229 −2,123 i18n/qgis_ru.ts
  24. +3,181 −2,131 i18n/qgis_sk.ts
  25. +2,946 −2,343 i18n/qgis_sq_AL.ts
  26. +3,254 −2,072 i18n/qgis_sv.ts
  27. +4,094 −2,308 i18n/qgis_th.ts
  28. +3,136 −2,197 i18n/qgis_tr.ts
  29. +3,038 −2,346 i18n/qgis_uk.ts
  30. +1,530 −425 i18n/qgis_vi.ts
  31. +1,024 −965 i18n/qgis_xh.ts
  32. +1,203 −684 i18n/qgis_zh_CN.ts
  33. +1,504 −564 i18n/qgis_zh_TW.ts
  34. +4 −0 mac/xcode/Qgis.xcodeproj/project.pbxproj
  35. +1 −1 python/CMakeLists.txt
  36. +11 −1 python/core/qgsmaplayer.sip
  37. +1 −1 python/plugins/fTools/doAbout.py
  38. +1 −1 python/plugins/fTools/fTools.py
  39. +160 −0 python/utils.py
  40. +2 −1 src/analysis/CMakeLists.txt
  41. +10 −0 src/analysis/interpolation/DualEdgeTriangulation.cc
  42. +187 −4 src/analysis/interpolation/qgstininterpolator.cpp
  43. +252 −0 src/analysis/vector/qgszonalstatistics.cpp
  44. +54 −0 src/analysis/vector/qgszonalstatistics.h
  45. +4 −0 src/app/attributetable/qgsattributetabledialog.cpp
  46. +7 −1 src/app/legend/qgslegend.cpp
  47. +4 −4 src/app/legend/qgslegendlayer.cpp
  48. +16 −4 src/app/ogr/qgsogrhelperfunctions.cpp
  49. +4 −0 src/app/qgisapp.cpp
  50. +18 −1 src/app/qgsmaptoolidentify.cpp
  51. +2 −1 src/app/qgsmaptoolidentify.h
  52. +14 −8 src/app/qgsoptions.cpp
  53. +23 −21 src/app/qgssinglesymboldialog.cpp
  54. +5 −6 src/core/composer/qgscomposerpicture.cpp
  55. +12 −6 src/core/qgshttptransaction.cpp
  56. +11 −0 src/core/qgshttptransaction.h
  57. +7 −0 src/core/qgsmaplayer.cpp
  58. +10 −1 src/core/qgsmaplayer.h
  59. +1 −1 src/core/qgsmaprenderer.cpp
  60. +5 −1 src/core/qgsvectorlayer.cpp
  61. +3 −3 src/plugins/coordinate_capture/CMakeLists.txt
  62. +1 −0 src/plugins/coordinate_capture/coordinatecapture.cpp
  63. +0 −3 src/plugins/coordinate_capture/coordinatecapturegui.cpp
  64. +1 −2 src/plugins/coordinate_capture/coordinatecapturegui.h
  65. +41 −61 src/plugins/diagram_overlay/qgsdiagramdialogbase.ui
  66. +24 −23 src/plugins/diagram_overlay/qgslinearlyscalingdialogbase.ui
  67. +35 −49 src/plugins/diagram_overlay/qgswkndiagramfactorywidgetbase.ui
  68. +2 −1 src/plugins/dxf2shp_converter/dxf2shpconvertergui.cpp
  69. +175 −180 src/plugins/dxf2shp_converter/dxf2shpconvertergui.ui
  70. +5 −1 src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp
  71. +9 −0 src/plugins/interpolation/qgsinterpolationdialog.cpp
  72. +1 −0 src/plugins/interpolation/qgsinterpolationdialog.h
  73. +171 −130 src/plugins/interpolation/qgsinterpolationdialogbase.ui
  74. +4 −1 src/plugins/wfs/qgswfssourceselect.cpp
  75. +5 −5 src/providers/postgres/qgspostgresprovider.cpp
  76. +9 −1 src/providers/wfs/qgswfsdata.cpp
  77. +4 −1 src/providers/wfs/qgswfsdata.h
  78. +31 −140 src/python/qgspythonutilsimpl.cpp
  79. +46 −45 src/ui/qgscontinuouscolordialogbase.ui
  80. +178 −185 src/ui/qgsgraduatedsymboldialogbase.ui
  81. +1 −1 src/ui/qgsidentifyresultsbase.ui
  82. +51 −105 src/ui/qgsoptionsbase.ui
  83. +298 −286 src/ui/qgssinglesymboldialogbase.ui
  84. +65 −51 src/ui/qgsuniquevaluedialogbase.ui
  85. +218 −217 src/ui/qgsvectorlayerpropertiesbase.ui
2 DONORS
@@ -21,7 +21,9 @@ Alexandre Leroux
Andreas Neumann
Associazione Monte Porzio Cultura
Carl Nelson
Christopher Kahler
D R Arbib
Dirk Pflugmacher
David Enns|http://www.mapitout.com/
Ecotrust|http://www.ecotrust.org/
Emanuele Zamprogno
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
libsm-dev, pyqt4-dev-tools
Build-Conflicts: libqgis1.4.0-dev, qgis-dev
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.3
XS-Python-Version: current
Homepage: http://qgis.org/
@@ -50,7 +50,7 @@ Description: Quantum GIS - shared libraries
This package contains the shared core and gui library that provide an
interface for plugins and stand-alone applications.

Package: libqgis1.4.0-dev
Package: libqgis-dev
Architecture: any
Section: libdevel
Depends: libqgis1.4.0 (= ${binary:Version}), libgdal1-dev,
@@ -59,8 +59,8 @@ Depends: libqgis1.4.0 (= ${binary:Version}), libgdal1-dev,
libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
qt4-designer (>=4.2.0)
Provides: libqgis-dev, qgis-dev
Replaces: libqgis-dev, qgis-dev, libqgis1-dev
Provides: qgis-dev
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
Description: Quantum GIS - development files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -70,7 +70,7 @@ Description: Quantum GIS - development files

Package: qgis-plugin-grass
Architecture: any
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.6.0-grass, grass64
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.6.0-grass, grass640-5+39438
Description: GRASS plugin for Quantum GIS
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

0 comments on commit be961f3

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