[QGIS Commit] r11979 - in branches/symbology-ng-branch: .
images/icons images/themes/default
python/plugins/mapserver_export python/plugins/osm
python/plugins/osm/map_tools python/plugins/osm/ui_files
src/analysis/raster src/app src/plugins/georeferencer src/ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Nov 7 14:43:57 EST 2009
Author: wonder
Date: 2009-11-07 14:43:56 -0500 (Sat, 07 Nov 2009)
New Revision: 11979
Modified:
branches/symbology-ng-branch/
branches/symbology-ng-branch/images/icons/qgis_icon.svg
branches/symbology-ng-branch/images/themes/default/mActionSaveAsPDF.png
branches/symbology-ng-branch/python/plugins/mapserver_export/CMakeLists.txt
branches/symbology-ng-branch/python/plugins/osm/OsmAddRelationDlg.py
branches/symbology-ng-branch/python/plugins/osm/OsmDatabaseManager.py
branches/symbology-ng-branch/python/plugins/osm/OsmDownloadDlg.py
branches/symbology-ng-branch/python/plugins/osm/OsmFeatureDW.py
branches/symbology-ng-branch/python/plugins/osm/OsmImportDlg.py
branches/symbology-ng-branch/python/plugins/osm/OsmLoadDlg.py
branches/symbology-ng-branch/python/plugins/osm/OsmPlugin.py
branches/symbology-ng-branch/python/plugins/osm/OsmSaveDlg.py
branches/symbology-ng-branch/python/plugins/osm/OsmUndoRedoDW.py
branches/symbology-ng-branch/python/plugins/osm/OsmUploadDlg.py
branches/symbology-ng-branch/python/plugins/osm/map_tools/OsmCreateLineMT.py
branches/symbology-ng-branch/python/plugins/osm/map_tools/OsmCreatePointMT.py
branches/symbology-ng-branch/python/plugins/osm/map_tools/OsmCreatePolygonMT.py
branches/symbology-ng-branch/python/plugins/osm/map_tools/OsmIdentifyMT.py
branches/symbology-ng-branch/python/plugins/osm/map_tools/OsmMoveMT.py
branches/symbology-ng-branch/python/plugins/osm/ui_files/OsmAddRelationDlg.ui
branches/symbology-ng-branch/python/plugins/osm/ui_files/OsmDownloadDlg.ui
branches/symbology-ng-branch/python/plugins/osm/ui_files/OsmFeatureDW.ui
branches/symbology-ng-branch/python/plugins/osm/ui_files/OsmImportDlg.ui
branches/symbology-ng-branch/python/plugins/osm/ui_files/OsmLoadDlg.ui
branches/symbology-ng-branch/python/plugins/osm/ui_files/OsmSaveDlg.ui
branches/symbology-ng-branch/python/plugins/osm/ui_files/OsmUndoRedoDW.ui
branches/symbology-ng-branch/python/plugins/osm/ui_files/OsmUploadDlg.ui
branches/symbology-ng-branch/src/analysis/raster/qgsaspectfilter.cpp
branches/symbology-ng-branch/src/analysis/raster/qgsaspectfilter.h
branches/symbology-ng-branch/src/analysis/raster/qgsderivativefilter.cpp
branches/symbology-ng-branch/src/analysis/raster/qgsderivativefilter.h
branches/symbology-ng-branch/src/analysis/raster/qgsninecellfilter.cpp
branches/symbology-ng-branch/src/analysis/raster/qgsninecellfilter.h
branches/symbology-ng-branch/src/analysis/raster/qgsruggednessfilter.cpp
branches/symbology-ng-branch/src/analysis/raster/qgsruggednessfilter.h
branches/symbology-ng-branch/src/analysis/raster/qgsslopefilter.cpp
branches/symbology-ng-branch/src/analysis/raster/qgsslopefilter.h
branches/symbology-ng-branch/src/analysis/raster/qgstotalcurvaturefilter.cpp
branches/symbology-ng-branch/src/analysis/raster/qgstotalcurvaturefilter.h
branches/symbology-ng-branch/src/app/qgsnewvectorlayerdialog.cpp
branches/symbology-ng-branch/src/app/qgsnewvectorlayerdialog.h
branches/symbology-ng-branch/src/plugins/georeferencer/qgsgeorefplugin.cpp
branches/symbology-ng-branch/src/plugins/georeferencer/qgsgeorefplugin.h
branches/symbology-ng-branch/src/ui/qgsnewvectorlayerdialogbase.ui
Log:
merge from trunk r11976:11978
Property changes on: branches/symbology-ng-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis:10769-11976
+ /trunk/qgis:10769-11978
Property changes on: branches/symbology-ng-branch/images/icons/qgis_icon.svg
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/images/icons/qgis_icon.svg:11301-11976
+ /trunk/qgis/images/icons/qgis_icon.svg:11301-11978
Property changes on: branches/symbology-ng-branch/images/themes/default/mActionSaveAsPDF.png
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/images/themes/default/mActionSaveAsPDF.png:11401-11976
+ /trunk/qgis/images/themes/default/mActionSaveAsPDF.png:11401-11978
Modified: branches/symbology-ng-branch/python/plugins/mapserver_export/CMakeLists.txt
===================================================================
--- branches/symbology-ng-branch/python/plugins/mapserver_export/CMakeLists.txt 2009-11-07 19:36:53 UTC (rev 11978)
+++ branches/symbology-ng-branch/python/plugins/mapserver_export/CMakeLists.txt 2009-11-07 19:43:56 UTC (rev 11979)
@@ -6,8 +6,6 @@
mapserverexportdialog.py
mapserverexport.py
ms_export.py
-resources.py
-ui_mapserverexport.py
)
PYQT4_WRAP_UI(PYUI_FILES qgsmapserverexportbase.ui)
PYQT4_ADD_RESOURCES(PYRC_FILES resources.qrc)
Property changes on: branches/symbology-ng-branch/python/plugins/osm/OsmAddRelationDlg.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/python/plugins/osm/OsmAddRelationDlg.py:11401-11976
+ /trunk/qgis/python/plugins/osm/OsmAddRelationDlg.py:11401-11978
Property changes on: branches/symbology-ng-branch/python/plugins/osm/OsmDatabaseManager.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/python/plugins/osm/OsmDatabaseManager.py:11401-11976
+ /trunk/qgis/python/plugins/osm/OsmDatabaseManager.py:11401-11978
Property changes on: branches/symbology-ng-branch/python/plugins/osm/OsmDownloadDlg.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/python/plugins/osm/OsmDownloadDlg.py:11401-11976
+ /trunk/qgis/python/plugins/osm/OsmDownloadDlg.py:11401-11978
Property changes on: branches/symbology-ng-branch/python/plugins/osm/OsmFeatureDW.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/python/plugins/osm/OsmFeatureDW.py:11401-11976
+ /trunk/qgis/python/plugins/osm/OsmFeatureDW.py:11401-11978
Property changes on: branches/symbology-ng-branch/python/plugins/osm/OsmImportDlg.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/python/plugins/osm/OsmImportDlg.py:11401-11976
+ /trunk/qgis/python/plugins/osm/OsmImportDlg.py:11401-11978
Property changes on: branches/symbology-ng-branch/python/plugins/osm/OsmLoadDlg.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/python/plugins/osm/OsmLoadDlg.py:11401-11976
+ /trunk/qgis/python/plugins/osm/OsmLoadDlg.py:11401-11978
Property changes on: branches/symbology-ng-branch/python/plugins/osm/OsmPlugin.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/python/plugins/osm/OsmPlugin.py:11401-11976
+ /trunk/qgis/python/plugins/osm/OsmPlugin.py:11401-11978
Property changes on: branches/symbology-ng-branch/python/plugins/osm/OsmSaveDlg.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/python/plugins/osm/OsmSaveDlg.py:11401-11976
+ /trunk/qgis/python/plugins/osm/OsmSaveDlg.py:11401-11978
Property changes on: branches/symbology-ng-branch/python/plugins/osm/OsmUndoRedoDW.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/python/plugins/osm/OsmUndoRedoDW.py:11401-11976
+ /trunk/qgis/python/plugins/osm/OsmUndoRedoDW.py:11401-11978
Property changes on: branches/symbology-ng-branch/python/plugins/osm/OsmUploadDlg.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/python/plugins/osm/OsmUploadDlg.py:11401-11976
+ /trunk/qgis/python/plugins/osm/OsmUploadDlg.py:11401-11978
Property changes on: branches/symbology-ng-branch/python/plugins/osm/map_tools/OsmCreateLineMT.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/python/plugins/osm/map_tools/OsmCreateLineMT.py:11401-11976
+ /trunk/qgis/python/plugins/osm/map_tools/OsmCreateLineMT.py:11401-11978
Property changes on: branches/symbology-ng-branch/python/plugins/osm/map_tools/OsmCreatePointMT.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/python/plugins/osm/map_tools/OsmCreatePointMT.py:11401-11976
+ /trunk/qgis/python/plugins/osm/map_tools/OsmCreatePointMT.py:11401-11978
Property changes on: branches/symbology-ng-branch/python/plugins/osm/map_tools/OsmCreatePolygonMT.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/python/plugins/osm/map_tools/OsmCreatePolygonMT.py:11401-11976
+ /trunk/qgis/python/plugins/osm/map_tools/OsmCreatePolygonMT.py:11401-11978
Property changes on: branches/symbology-ng-branch/python/plugins/osm/map_tools/OsmIdentifyMT.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/python/plugins/osm/map_tools/OsmIdentifyMT.py:11401-11976
+ /trunk/qgis/python/plugins/osm/map_tools/OsmIdentifyMT.py:11401-11978
Property changes on: branches/symbology-ng-branch/python/plugins/osm/map_tools/OsmMoveMT.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/python/plugins/osm/map_tools/OsmMoveMT.py:11401-11976
+ /trunk/qgis/python/plugins/osm/map_tools/OsmMoveMT.py:11401-11978
Property changes on: branches/symbology-ng-branch/python/plugins/osm/ui_files/OsmAddRelationDlg.ui
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/python/plugins/osm/ui_files/OsmAddRelationDlg.ui:11401-11976
+ /trunk/qgis/python/plugins/osm/ui_files/OsmAddRelationDlg.ui:11401-11978
Property changes on: branches/symbology-ng-branch/python/plugins/osm/ui_files/OsmDownloadDlg.ui
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/python/plugins/osm/ui_files/OsmDownloadDlg.ui:11401-11976
+ /trunk/qgis/python/plugins/osm/ui_files/OsmDownloadDlg.ui:11401-11978
Property changes on: branches/symbology-ng-branch/python/plugins/osm/ui_files/OsmFeatureDW.ui
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/python/plugins/osm/ui_files/OsmFeatureDW.ui:11401-11976
+ /trunk/qgis/python/plugins/osm/ui_files/OsmFeatureDW.ui:11401-11978
Property changes on: branches/symbology-ng-branch/python/plugins/osm/ui_files/OsmImportDlg.ui
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/python/plugins/osm/ui_files/OsmImportDlg.ui:11401-11976
+ /trunk/qgis/python/plugins/osm/ui_files/OsmImportDlg.ui:11401-11978
Property changes on: branches/symbology-ng-branch/python/plugins/osm/ui_files/OsmLoadDlg.ui
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/python/plugins/osm/ui_files/OsmLoadDlg.ui:11401-11976
+ /trunk/qgis/python/plugins/osm/ui_files/OsmLoadDlg.ui:11401-11978
Property changes on: branches/symbology-ng-branch/python/plugins/osm/ui_files/OsmSaveDlg.ui
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/python/plugins/osm/ui_files/OsmSaveDlg.ui:11401-11976
+ /trunk/qgis/python/plugins/osm/ui_files/OsmSaveDlg.ui:11401-11978
Property changes on: branches/symbology-ng-branch/python/plugins/osm/ui_files/OsmUndoRedoDW.ui
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/python/plugins/osm/ui_files/OsmUndoRedoDW.ui:11401-11976
+ /trunk/qgis/python/plugins/osm/ui_files/OsmUndoRedoDW.ui:11401-11978
Property changes on: branches/symbology-ng-branch/python/plugins/osm/ui_files/OsmUploadDlg.ui
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/python/plugins/osm/ui_files/OsmUploadDlg.ui:11401-11976
+ /trunk/qgis/python/plugins/osm/ui_files/OsmUploadDlg.ui:11401-11978
Property changes on: branches/symbology-ng-branch/src/analysis/raster/qgsaspectfilter.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/src/analysis/raster/qgsaspectfilter.cpp:11601-11976
+ /trunk/qgis/src/analysis/raster/qgsaspectfilter.cpp:11601-11978
Property changes on: branches/symbology-ng-branch/src/analysis/raster/qgsaspectfilter.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/src/analysis/raster/qgsaspectfilter.h:11601-11976
+ /trunk/qgis/src/analysis/raster/qgsaspectfilter.h:11601-11978
Property changes on: branches/symbology-ng-branch/src/analysis/raster/qgsderivativefilter.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/src/analysis/raster/qgsderivativefilter.cpp:11601-11976
+ /trunk/qgis/src/analysis/raster/qgsderivativefilter.cpp:11601-11978
Property changes on: branches/symbology-ng-branch/src/analysis/raster/qgsderivativefilter.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/src/analysis/raster/qgsderivativefilter.h:11601-11976
+ /trunk/qgis/src/analysis/raster/qgsderivativefilter.h:11601-11978
Property changes on: branches/symbology-ng-branch/src/analysis/raster/qgsninecellfilter.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/src/analysis/raster/qgsninecellfilter.cpp:11601-11976
+ /trunk/qgis/src/analysis/raster/qgsninecellfilter.cpp:11601-11978
Property changes on: branches/symbology-ng-branch/src/analysis/raster/qgsninecellfilter.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/src/analysis/raster/qgsninecellfilter.h:11601-11976
+ /trunk/qgis/src/analysis/raster/qgsninecellfilter.h:11601-11978
Property changes on: branches/symbology-ng-branch/src/analysis/raster/qgsruggednessfilter.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/src/analysis/raster/qgsruggednessfilter.cpp:11601-11976
+ /trunk/qgis/src/analysis/raster/qgsruggednessfilter.cpp:11601-11978
Property changes on: branches/symbology-ng-branch/src/analysis/raster/qgsruggednessfilter.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/src/analysis/raster/qgsruggednessfilter.h:11601-11976
+ /trunk/qgis/src/analysis/raster/qgsruggednessfilter.h:11601-11978
Property changes on: branches/symbology-ng-branch/src/analysis/raster/qgsslopefilter.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/src/analysis/raster/qgsslopefilter.cpp:11601-11976
+ /trunk/qgis/src/analysis/raster/qgsslopefilter.cpp:11601-11978
Property changes on: branches/symbology-ng-branch/src/analysis/raster/qgsslopefilter.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/src/analysis/raster/qgsslopefilter.h:11601-11976
+ /trunk/qgis/src/analysis/raster/qgsslopefilter.h:11601-11978
Property changes on: branches/symbology-ng-branch/src/analysis/raster/qgstotalcurvaturefilter.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/src/analysis/raster/qgstotalcurvaturefilter.cpp:11601-11976
+ /trunk/qgis/src/analysis/raster/qgstotalcurvaturefilter.cpp:11601-11978
Property changes on: branches/symbology-ng-branch/src/analysis/raster/qgstotalcurvaturefilter.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/src/analysis/raster/qgstotalcurvaturefilter.h:11601-11976
+ /trunk/qgis/src/analysis/raster/qgstotalcurvaturefilter.h:11601-11978
Property changes on: branches/symbology-ng-branch/src/app/qgsnewvectorlayerdialog.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/src/app/qgsnewvectorlayerdialog.cpp:11751-11976
+ /trunk/qgis/src/app/qgsnewvectorlayerdialog.cpp:11751-11978
Property changes on: branches/symbology-ng-branch/src/app/qgsnewvectorlayerdialog.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/src/app/qgsnewvectorlayerdialog.h:11751-11976
+ /trunk/qgis/src/app/qgsnewvectorlayerdialog.h:11751-11978
Property changes on: branches/symbology-ng-branch/src/plugins/georeferencer/qgsgeorefplugin.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/src/plugins/georeferencer/qgsgeorefplugin.cpp:11201-11976
+ /trunk/qgis/src/plugins/georeferencer/qgsgeorefplugin.cpp:11201-11978
Property changes on: branches/symbology-ng-branch/src/plugins/georeferencer/qgsgeorefplugin.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/src/plugins/georeferencer/qgsgeorefplugin.h:11201-11976
+ /trunk/qgis/src/plugins/georeferencer/qgsgeorefplugin.h:11201-11978
Property changes on: branches/symbology-ng-branch/src/ui/qgsnewvectorlayerdialogbase.ui
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/qgis/src/ui/qgsnewvectorlayerdialogbase.ui:11751-11976
+ /trunk/qgis/src/ui/qgsnewvectorlayerdialogbase.ui:11751-11978
More information about the QGIS-commit
mailing list