← Back to branch summary

~ubuntu-branches/ubuntu/natty/merkaartor/natty

~ubuntu-branches/ubuntu/natty/merkaartor/natty

Viewing all changes in revision 19.

Committer: Bazaar Package Importer
Author(s): Bernd Zeimetz
Date: 2011-02-11 14:28:38 UTC
mfrom: (1.2.12 upstream) (3.1.15 sid)
Revision ID: james.westby@ubuntu.com-20110211142838-tjrsw2ffarnvzmvl

Tags: 0.17.2-1

* New upstream release - 0.17.2
* [b3dc89d4] Merge branch 'upstream'

files modified:
.indent.pro

3rdparty/qttoolbardialog-2.2_1-opensource/configure *

CHANGELOG

debian/changelog

interfaces/IImageManager.cpp

macos/mklocversion.sh *

plugins/background/MCadastreFranceBackground/CadastreFrance.cpp

plugins/background/MMsBingMapBackground/msbingmapadapter.cpp

plugins/background/MMsBingMapBackground/msbingmapadapter.h

src/Commands/FeatureCommands.cpp

src/Docks/FeaturesDock.cpp

src/Document.cpp

src/Features/Feature.cpp

src/Features/Feature.h

src/Features/Relation.cpp

src/Features/Way.cpp

src/ImportExport/ImportExportGdal.cpp

src/Layers/ImageMapLayer.cpp

src/Layers/ImageMapLayer.h

src/Layers/Layer.cpp

src/Layers/LicenseDisplayDialog.ui *

src/Main.cpp

src/MainWindow.cpp *

src/Maps/FeatureManipulations.cpp

src/PaintStyle/FeaturePainter.cpp

src/Preferences/FilterPreferencesDialog.cpp

src/Preferences/FilterPreferencesDialog.h

src/Preferences/MerkaartorPreferences.cpp

src/Preferences/PreferencesDialog.ui

src/Sync/DownloadOSM.cpp

src/TagTemplate/TagTemplate.cpp

src/Utils/SelectionDialog.cpp

src/Utils/TagSelector.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

interfaces/IImageManager.cpp

plugins/background/MCadastreFranceBackground/CadastreFrance.cpp

plugins/background/MMsBingMapBackground/msbingmapadapter.cpp

plugins/background/MMsBingMapBackground/msbingmapadapter.h

src/Commands/FeatureCommands.cpp

src/Docks/FeaturesDock.cpp

src/Document.cpp

src/Features/Feature.cpp

src/Features/Feature.h

src/Features/Relation.cpp

src/Features/Way.cpp

src/ImportExport/ImportExportGdal.cpp

src/Layers/ImageMapLayer.cpp

src/Layers/ImageMapLayer.h

src/Layers/Layer.cpp

src/MainWindow.cpp

src/Maps/FeatureManipulations.cpp

src/PaintStyle/FeaturePainter.cpp

src/Preferences/FilterPreferencesDialog.cpp

src/Preferences/FilterPreferencesDialog.h

src/Preferences/MerkaartorPreferences.cpp

src/Preferences/PreferencesDialog.ui

src/Sync/DownloadOSM.cpp

src/TagTemplate/TagTemplate.cpp

src/Utils/SelectionDialog.cpp

src/Utils/TagSelector.cpp

Older »