[QGIS Commit] r12127 - in branches/symbology-ng-branch: python/plugins/osm python/plugins/osm/map_tools python/plugins/osm/ui_files src/analysis/raster

[svn_qgis at osgeo.org]

Author: wonder
Date: 2009-11-15 13:32:16 -0500 (Sun, 15 Nov 2009)
New Revision: 12127

Modified:
   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
Log:
removed svn:mergeinfo property



Property changes on: branches/symbology-ng-branch/python/plugins/osm/OsmAddRelationDlg.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/python/plugins/osm/OsmAddRelationDlg.py:11401-11988


Property changes on: branches/symbology-ng-branch/python/plugins/osm/OsmDatabaseManager.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/python/plugins/osm/OsmDatabaseManager.py:11401-11988


Property changes on: branches/symbology-ng-branch/python/plugins/osm/OsmDownloadDlg.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/python/plugins/osm/OsmDownloadDlg.py:11401-11988


Property changes on: branches/symbology-ng-branch/python/plugins/osm/OsmFeatureDW.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/python/plugins/osm/OsmFeatureDW.py:11401-11988


Property changes on: branches/symbology-ng-branch/python/plugins/osm/OsmImportDlg.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/python/plugins/osm/OsmImportDlg.py:11401-11988


Property changes on: branches/symbology-ng-branch/python/plugins/osm/OsmLoadDlg.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/python/plugins/osm/OsmLoadDlg.py:11401-11988


Property changes on: branches/symbology-ng-branch/python/plugins/osm/OsmPlugin.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/python/plugins/osm/OsmPlugin.py:11401-11988


Property changes on: branches/symbology-ng-branch/python/plugins/osm/OsmSaveDlg.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/python/plugins/osm/OsmSaveDlg.py:11401-11988


Property changes on: branches/symbology-ng-branch/python/plugins/osm/OsmUndoRedoDW.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/python/plugins/osm/OsmUndoRedoDW.py:11401-11988


Property changes on: branches/symbology-ng-branch/python/plugins/osm/OsmUploadDlg.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/python/plugins/osm/OsmUploadDlg.py:11401-11988


Property changes on: branches/symbology-ng-branch/python/plugins/osm/map_tools/OsmCreateLineMT.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/python/plugins/osm/map_tools/OsmCreateLineMT.py:11401-11988


Property changes on: branches/symbology-ng-branch/python/plugins/osm/map_tools/OsmCreatePointMT.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/python/plugins/osm/map_tools/OsmCreatePointMT.py:11401-11988


Property changes on: branches/symbology-ng-branch/python/plugins/osm/map_tools/OsmCreatePolygonMT.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/python/plugins/osm/map_tools/OsmCreatePolygonMT.py:11401-11988


Property changes on: branches/symbology-ng-branch/python/plugins/osm/map_tools/OsmIdentifyMT.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/python/plugins/osm/map_tools/OsmIdentifyMT.py:11401-11988


Property changes on: branches/symbology-ng-branch/python/plugins/osm/map_tools/OsmMoveMT.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/python/plugins/osm/map_tools/OsmMoveMT.py:11401-11988


Property changes on: branches/symbology-ng-branch/python/plugins/osm/ui_files/OsmAddRelationDlg.ui
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/python/plugins/osm/ui_files/OsmAddRelationDlg.ui:11401-11988


Property changes on: branches/symbology-ng-branch/python/plugins/osm/ui_files/OsmDownloadDlg.ui
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/python/plugins/osm/ui_files/OsmDownloadDlg.ui:11401-11988


Property changes on: branches/symbology-ng-branch/python/plugins/osm/ui_files/OsmFeatureDW.ui
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/python/plugins/osm/ui_files/OsmFeatureDW.ui:11401-11988


Property changes on: branches/symbology-ng-branch/python/plugins/osm/ui_files/OsmImportDlg.ui
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/python/plugins/osm/ui_files/OsmImportDlg.ui:11401-11988


Property changes on: branches/symbology-ng-branch/python/plugins/osm/ui_files/OsmLoadDlg.ui
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/python/plugins/osm/ui_files/OsmLoadDlg.ui:11401-11988


Property changes on: branches/symbology-ng-branch/python/plugins/osm/ui_files/OsmSaveDlg.ui
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/python/plugins/osm/ui_files/OsmSaveDlg.ui:11401-11988


Property changes on: branches/symbology-ng-branch/python/plugins/osm/ui_files/OsmUndoRedoDW.ui
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/python/plugins/osm/ui_files/OsmUndoRedoDW.ui:11401-11988


Property changes on: branches/symbology-ng-branch/python/plugins/osm/ui_files/OsmUploadDlg.ui
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/python/plugins/osm/ui_files/OsmUploadDlg.ui:11401-11988


Property changes on: branches/symbology-ng-branch/src/analysis/raster/qgsaspectfilter.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/src/analysis/raster/qgsaspectfilter.cpp:11601-11988


Property changes on: branches/symbology-ng-branch/src/analysis/raster/qgsaspectfilter.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/src/analysis/raster/qgsaspectfilter.h:11601-11988


Property changes on: branches/symbology-ng-branch/src/analysis/raster/qgsderivativefilter.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/src/analysis/raster/qgsderivativefilter.cpp:11601-11988


Property changes on: branches/symbology-ng-branch/src/analysis/raster/qgsderivativefilter.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/src/analysis/raster/qgsderivativefilter.h:11601-11988


Property changes on: branches/symbology-ng-branch/src/analysis/raster/qgsninecellfilter.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/src/analysis/raster/qgsninecellfilter.cpp:11601-11988


Property changes on: branches/symbology-ng-branch/src/analysis/raster/qgsninecellfilter.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/src/analysis/raster/qgsninecellfilter.h:11601-11988


Property changes on: branches/symbology-ng-branch/src/analysis/raster/qgsruggednessfilter.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/src/analysis/raster/qgsruggednessfilter.cpp:11601-11988


Property changes on: branches/symbology-ng-branch/src/analysis/raster/qgsruggednessfilter.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/src/analysis/raster/qgsruggednessfilter.h:11601-11988


Property changes on: branches/symbology-ng-branch/src/analysis/raster/qgsslopefilter.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/src/analysis/raster/qgsslopefilter.cpp:11601-11988


Property changes on: branches/symbology-ng-branch/src/analysis/raster/qgsslopefilter.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/src/analysis/raster/qgsslopefilter.h:11601-11988


Property changes on: branches/symbology-ng-branch/src/analysis/raster/qgstotalcurvaturefilter.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/src/analysis/raster/qgstotalcurvaturefilter.cpp:11601-11988


Property changes on: branches/symbology-ng-branch/src/analysis/raster/qgstotalcurvaturefilter.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /trunk/qgis/src/analysis/raster/qgstotalcurvaturefilter.h:11601-11988