[josm-plugins] 135/369: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-grass/josm-plugins
Bas Couwenberg
sebastic at xs4all.nl
Sat Oct 18 12:03:35 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository josm-plugins.
commit a2b7b2a12febb2f5e973ec7b34748d0aab7f9abe
Merge: 2240a78 d6268b5
Author: David Paleino <dapal at debian.org>
Date: Wed Jun 2 10:20:50 2010 +0200
Merge branch 'master' of git+ssh://git.debian.org/git/pkg-grass/josm-plugins
Conflicts:
debian/changelog
debian/control
debian/patches/150_routing.diff
DirectUpload/README | 1 -
.../plugins/DirectUpload/UploadDataGuiPlugin.java | 12 +-
cadastre-fr/build.xml | 2 +-
cadastre-fr/images/mapmode/buildings.png | Bin 0 -> 187 bytes
cadastre-fr/src/cadastre_fr/Buildings.java | 656 +++++++++++++++++++++
.../src/cadastre_fr/BuildingsImageModifier.java | 21 +
cadastre-fr/src/cadastre_fr/CacheControl.java | 72 +--
.../src/cadastre_fr/CacheFileUTM20NFilter.java | 3 +-
cadastre-fr/src/cadastre_fr/CadastreGrabber.java | 55 +-
cadastre-fr/src/cadastre_fr/CadastreInterface.java | 17 +-
cadastre-fr/src/cadastre_fr/CadastrePlugin.java | 94 +--
.../src/cadastre_fr/CadastrePreferenceSetting.java | 11 +-
.../src/cadastre_fr/DownloadSVGBuilding.java | 12 +-
cadastre-fr/src/cadastre_fr/DownloadSVGTask.java | 11 +-
.../src/cadastre_fr/DownloadWMSPlanImage.java | 9 +-
.../src/cadastre_fr/DownloadWMSVectorImage.java | 25 +-
cadastre-fr/src/cadastre_fr/GeorefImage.java | 2 +-
cadastre-fr/src/cadastre_fr/ImageModifier.java | 55 ++
.../src/cadastre_fr/MenuActionBuildings.java | 26 +-
cadastre-fr/src/cadastre_fr/MenuActionGrab.java | 2 +-
.../src/cadastre_fr/MenuActionLoadFromCache.java | 10 +-
.../src/cadastre_fr/MenuActionNewLocation.java | 12 +-
cadastre-fr/src/cadastre_fr/SimplifyWay.java | 54 +-
.../src/cadastre_fr/VectorImageModifier.java | 7 +-
cadastre-fr/src/cadastre_fr/WMSDownloadAction.java | 24 +-
cadastre-fr/src/cadastre_fr/WMSException.java | 14 +
cadastre-fr/src/cadastre_fr/WMSLayer.java | 93 ++-
debian/changelog | 7 +-
debian/control | 16 +-
debian/patches/00list | 12 -
.../{100_surveyor.dpatch => 100_surveyor.diff} | 9 +-
.../{10_colorscheme.dpatch => 10_colorscheme.diff} | 9 +-
...110_cadastre-fr.dpatch => 110_cadastre-fr.diff} | 9 +-
...0_DirectUpload.dpatch => 120_DirectUpload.diff} | 9 +-
.../{130_editgpx.dpatch => 130_editgpx.diff} | 9 +-
.../{140_lakewalker.dpatch => 140_lakewalker.diff} | 9 +-
.../{150_routing.dpatch => 150_routing.diff} | 15 +-
.../patches/{20_livegps.dpatch => 20_livegps.diff} | 9 +-
.../{30_slippymap.dpatch => 30_slippymap.diff} | 9 +-
.../{60_wmsplugin.dpatch => 60_wmsplugin.diff} | 9 +-
.../{80_measurement.dpatch => 80_measurement.diff} | 9 +-
.../{90_openvisible.dpatch => 90_openvisible.diff} | 9 +-
debian/patches/series | 12 +
debian/rules | 1 -
debian/source/format | 1 +
livegps/build.xml | 18 +-
livegps/src/livegps/AppendableGpxTrackSegment.java | 5 +
livegps/src/livegps/LiveGpsAcquirer.java | 3 +-
livegps/src/livegps/LiveGpsLayer.java | 1 -
livegps/src/livegps/LiveGpsPlugin.java | 1 -
livegps/src/livegps/SingleSegmentGpxTrack.java | 5 +
svn-info.xml | 8 +-
wmsplugin/build.xml | 2 +-
wmsplugin/src/wmsplugin/WMSGrabber.java | 5 +-
54 files changed, 1157 insertions(+), 354 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git
More information about the Pkg-grass-devel
mailing list