Skip to content
Permalink
Browse files

merge from trunk r11950:11971... in sync again!

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11972 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder
wonder committed Nov 7, 2009
1 parent be961f3 commit 0e6aa15326b1ff4c4431f59daceaeaed9479084f
Showing with 38,372 additions and 29,814 deletions.
  1. +2 −1 debian/changelog
  2. +202 −0 debian/libqgis{QGIS_ABI}.symbols
  3. +1 −2 debian/python-qgis.install.in
  4. +1 −0 debian/python-qgis.symbols
  5. +1 −0 debian/qgis-plugin-grass.symbols
  6. +835 −951 i18n/qgis_ar.ts
  7. +1,037 −799 i18n/qgis_cs_CZ.ts
  8. +1,200 −728 i18n/qgis_de.ts
  9. +823 −947 i18n/qgis_el_GR.ts
  10. +1,126 −764 i18n/qgis_es.ts
  11. +1,143 −811 i18n/qgis_fr.ts
  12. +817 −944 i18n/qgis_he.ts
  13. +1,099 −800 i18n/qgis_hu.ts
  14. +915 −929 i18n/qgis_id.ts
  15. +1,088 −762 i18n/qgis_it.ts
  16. +960 −898 i18n/qgis_ja.ts
  17. +1,041 −799 i18n/qgis_ka_GE.ts
  18. +985 −907 i18n/qgis_lo.ts
  19. +828 −951 i18n/qgis_lt.ts
  20. +1,081 −786 i18n/qgis_lv.ts
  21. +966 −896 i18n/qgis_mn.ts
  22. +1,120 −766 i18n/qgis_nl.ts
  23. +1,426 −985 i18n/qgis_pl_PL.ts
  24. +1,079 −777 i18n/qgis_pt_BR.ts
  25. +885 −935 i18n/qgis_ro.ts
  26. +1,106 −795 i18n/qgis_ru.ts
  27. +1,045 −795 i18n/qgis_sk.ts
  28. +976 −898 i18n/qgis_sq_AL.ts
  29. +1,086 −772 i18n/qgis_sv.ts
  30. +1,125 −763 i18n/qgis_th.ts
  31. +1,023 −858 i18n/qgis_tr.ts
  32. +996 −857 i18n/qgis_uk.ts
  33. +519 −197 i18n/qgis_vi.ts
  34. +290 −382 i18n/qgis_xh.ts
  35. +416 −303 i18n/qgis_zh_CN.ts
  36. +498 −211 i18n/qgis_zh_TW.ts
  37. +32 −27 mac/xcode/Qgis.xcodeproj/project.pbxproj
  38. +9 −7 python/plugins/mapserver_export/CMakeLists.txt
  39. +48 −8 python/plugins/mapserver_export/mapserverexport.py
  40. +18 −3 python/plugins/mapserver_export/mapserverexportdialog.py
  41. +422 −85 python/plugins/mapserver_export/ms_export.py
  42. +363 −227 python/plugins/mapserver_export/qgsmapserverexportbase.ui
  43. +5 −0 src/analysis/CMakeLists.txt
  44. +160 −0 src/analysis/interpolation/Bezier3D.cc
  45. +136 −0 src/analysis/interpolation/Bezier3D.h
  46. +735 −0 src/analysis/interpolation/CloughTocherInterpolator.cc
  47. +118 −0 src/analysis/interpolation/CloughTocherInterpolator.h
  48. +595 −0 src/analysis/interpolation/NormVecDecorator.cc
  49. +107 −0 src/analysis/interpolation/NormVecDecorator.h
  50. +78 −0 src/analysis/interpolation/ParametricLine.cc
  51. +83 −0 src/analysis/interpolation/ParametricLine.h
  52. +346 −0 src/analysis/interpolation/TriDecorator.cc
  53. +86 −0 src/analysis/interpolation/TriDecorator.h
  54. +31 −4 src/analysis/interpolation/qgstininterpolator.cpp
  55. +9 −1 src/analysis/interpolation/qgstininterpolator.h
  56. +7 −1 src/app/composer/qgscomposer.cpp
  57. +5 −21 src/app/composer/qgscomposermapwidget.cpp
  58. +1 −2 src/app/composer/qgscomposermapwidget.h
  59. +1 −1 src/core/qgsmaplayerregistry.cpp
  60. +1 −1 src/gui/qgsdetaileditemdelegate.cpp
  61. +167 −138 src/plugins/copyright_label/pluginguibase.ui
  62. +0 −13 src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp
  63. +256 −269 src/plugins/delimited_text/qgsdelimitedtextpluginguibase.ui
  64. +2 −8 src/plugins/georeferencer/mapcoordsdialog.cpp
  65. +1 −2 src/plugins/georeferencer/mapcoordsdialog.h
  66. +47 −160 src/plugins/georeferencer/mapcoordsdialogbase.ui
  67. +41 −43 src/plugins/georeferencer/qgsgeorefwarpoptionsdialogbase.ui
  68. +170 −153 src/plugins/georeferencer/qgspointdialogbase.ui
  69. +0 −4 src/plugins/gps_importer/qgsgpsdevicedialog.cpp
  70. +283 −259 src/plugins/gps_importer/qgsgpsdevicedialogbase.ui
  71. +0 −89 src/plugins/gps_importer/qgsgpsplugingui.cpp
  72. +457 −516 src/plugins/gps_importer/qgsgpspluginguibase.ui
  73. +94 −92 src/plugins/interpolation/qgsidwinterpolatordialogbase.ui
  74. +398 −410 src/plugins/interpolation/qgsinterpolationdialogbase.ui
  75. +13 −3 src/plugins/interpolation/qgstininterpolatordialog.cpp
  76. +136 −105 src/plugins/interpolation/qgstininterpolatordialogbase.ui
  77. +161 −165 src/plugins/north_arrow/pluginguibase.ui
  78. +340 −320 src/plugins/ogr_converter/ogrconverterguibase.ui
  79. +109 −248 src/plugins/oracle_raster/qgsoracleconnectbase.ui
  80. +2 −2 src/plugins/oracle_raster/qgsselectgeoraster_ui.cpp
  81. +239 −284 src/plugins/oracle_raster/qgsselectgeorasterbase.ui
  82. +151 −180 src/plugins/quick_print/quickprintguibase.ui
  83. +158 −144 src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialogbase.ui
  84. +127 −210 src/plugins/scale_bar/pluginguibase.ui
  85. +220 −206 src/plugins/spit/qgsspitbase.ui
  86. +188 −177 src/plugins/wfs/qgswfssourceselectbase.ui
  87. +13 −9 src/ui/qgsaddattrdialogbase.ui
  88. +1 −1 src/ui/qgscomposerbase.ui
  89. +16 −13 src/ui/qgscomposeritemwidgetbase.ui
  90. +542 −404 src/ui/qgscomposermapwidgetbase.ui
  91. +305 −298 src/ui/qgscompositionwidgetbase.ui
  92. +121 −78 src/ui/qgscontinuouscolordialogbase.ui
  93. +122 −114 src/ui/qgscustomprojectiondialogbase.ui
  94. +2 −2 src/ui/qgsfieldcalculatorbase.ui
  95. +62 −61 src/ui/qgsitempositiondialogbase.ui
  96. +60 −46 src/ui/qgsmeasurebase.ui
  97. +231 −231 src/ui/qgsvectorlayerpropertiesbase.ui
@@ -6,8 +6,9 @@ qgis (1.4.0) UNRELEASED; urgency=low
* remove README.Debian from libqgis-dev
* add symbol files for shared libraries
* shorten qgis.sh
* add all python files in qgis' site-packages

-- Jürgen E. Fischer <jef@norbit.de> Sun, 27 Sep 2009 02:34:35 +0200
-- Jürgen E. Fischer <jef@norbit.de> Sat, 07 Nov 2009 16:19:33 +0100

qgis (1.3.0) UNRELEASED; urgency=low

Large diffs are not rendered by default.

@@ -1,4 +1,3 @@
usr/lib/python*/{dist,site}-packages/qgis/__init__.py
usr/lib/python*/{dist,site}-packages/qgis/qgisconfig.py
usr/lib/python*/{dist,site}-packages/qgis/*.py
usr/lib/python*/{dist,site}-packages/qgis/*.so
usr/lib/libqgispython.so.{QGIS_ABI}
@@ -43,5 +43,6 @@ libqgispython.so.1.4.0 python-qgis #MINVER#
_ZTS18QgsPythonUtilsImpl@Base 1.4.0
_ZTV14QgsPythonUtils@Base 1.4.0
_ZTV18QgsPythonUtilsImpl@Base 1.4.0
_ZplPKcRK7QString@Base 1.4.0
_ZplRK7QStringPKc@Base 1.4.0
instance@Base 1.4.0
@@ -7,6 +7,7 @@ libqgisgrass.so.1.4.0 qgis-plugin-grass #MINVER#
_ZN15QgsDataProvider13updateExtentsEv@Base 1.4.0
_ZN15QgsDataProvider15setSubsetStringE7QString@Base 1.4.0
_ZN15QgsDataProvider16setDataSourceUriERK7QString@Base 1.4.0
_ZN15QgsDataProvider20supportsSubsetStringEv@Base 1.4.0
_ZN15QgsDataProvider21setSubLayerVisibilityE7QStringb@Base 1.4.0
_ZN16QgsGrassProvider10attributesEii@Base 1.4.0
_ZN16QgsGrassProvider10closeLayerEi@Base 1.4.0

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

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 0e6aa15

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