[josm-plugins] 209/369: Merge commit 'upstream/0.0.svn24632'

[Bas Couwenberg]

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 67a66f95641d445dcaf4974d9d6d4404e9fbdffb
Merge: 1370c11 2d3e409
Author: David Paleino <dapal at debian.org>
Date:   Wed Dec 8 19:45:17 2010 +0100

    Merge commit 'upstream/0.0.svn24632'

 editgpx/build.xml                                  |   8 +-
 imagery/sources.cfg                                |  69 -----
 .../josm/plugins/imagery/ImageryLayer.java         | 134 +++++++-
 .../josm/plugins/imagery/ImageryLayerInfo.java     |   5 +
 .../josm/plugins/imagery/ImageryPlugin.java        |   7 +-
 .../plugins/imagery/ImageryPreferenceEditor.java   | 337 +++------------------
 .../josm/plugins/imagery/ImageryPreferences.java   |   6 +-
 .../plugins/imagery/ImageryProvidersPanel.java     | 218 ++++---------
 .../josm/plugins/imagery/OffsetBookmark.java       |  75 +++++
 .../josm/plugins/imagery/OffsetBookmarksPanel.java | 155 ++++++++++
 .../josm/plugins/imagery/tms/TMSLayer.java         |  24 +-
 .../josm/plugins/imagery/tms/TMSPreferences.java   |  17 ++
 .../josm/plugins/imagery/tms/TMSTileSource.java    |   2 +-
 .../plugins/imagery/tms/TMSTileSourceProvider.java |  41 +++
 .../josm/plugins/imagery/wms/GeorefImage.java      |   1 +
 .../josm/plugins/imagery/wms/HTMLGrabber.java      |   4 +-
 .../josm/plugins/imagery/wms/WMSAdapter.java       |  10 +-
 .../josm/plugins/imagery/wms/WMSGrabber.java       |  12 +-
 .../josm/plugins/imagery/wms/WMSLayer.java         |  11 +-
 svn-info.xml                                       |   8 +-
 wmsplugin/src/wmsplugin/WMSPreferenceEditor.java   |   2 +
 wmsplugin/webkit-image.cpp                         |   6 +-
 22 files changed, 579 insertions(+), 573 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git