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 8637c8c28840ce4c79a680cb604add94b3bd4dfc
Merge: a2b7b2a 375f232
Author: David Paleino <da...@debian.org>
Date:   Sat Jun 12 13:13:14 2010 +0200

    Merge commit 'upstream/0.0.svn21666'

 cadastre-fr/src/cadastre_fr/CacheControl.java      |   32 +-
 cadastre-fr/src/cadastre_fr/CadastreInterface.java |   17 +-
 cadastre-fr/src/cadastre_fr/CadastrePlugin.java    |    2 +
 .../src/cadastre_fr/CadastrePreferenceSetting.java |    4 +-
 .../src/cadastre_fr/DownloadWMSPlanImage.java      |    3 +-
 .../src/cadastre_fr/MenuActionGrabPlanImage.java   |  124 +-
 .../src/cadastre_fr/MenuActionNewLocation.java     |   45 +-
 cadastre-fr/src/cadastre_fr/WMSLayer.java          |   10 +
 .../plugin/colorscheme/ColorSchemePreference.java  |   14 +-
 editgpx/.settings/org.eclipse.jdt.ui.prefs         |   54 +
 .../josm/plugins/editgpx/EditGpxLayer.java         |  115 +-
 .../josm/plugins/editgpx/EditGpxMode.java          |  279 ++--
 .../josm/plugins/editgpx/EditGpxPlugin.java        |  116 +-
 .../josm/plugins/editgpx/GPXLayerImportAction.java |  191 ++-
 .../josm/plugins/editgpx/data/EditGpxData.java     |   62 +
 .../josm/plugins/editgpx/data/EditGpxTrack.java    |   57 +
 .../plugins/editgpx/data/EditGpxTrackSegment.java  |   44 +
 .../josm/plugins/editgpx/data/EditGpxWayPoint.java |   39 +
 livegps/src/livegps/LiveGpsAcquirer.java           |  293 ++--
 livegps/src/org/json/JSONArray.java                |  918 ++++++++++++
 livegps/src/org/json/JSONException.java            |   31 +
 livegps/src/org/json/JSONObject.java               | 1584 ++++++++++++++++++++
 livegps/src/org/json/JSONString.java               |   18 +
 livegps/src/org/json/JSONTokener.java              |  435 ++++++
 .../plugins/measurement/MeasurementDialog.java     |   67 +-
 .../josm/plugins/slippymap/SlippyMapLayer.java     |   18 +-
 svn-info.xml                                       |    8 +-
 wmsplugin/sources.cfg                              |    2 +-
 wmsplugin/src/wmsplugin/WMSLayer.java              |    2 +-
 wmsplugin/webkit-image-gtk.c                       |   45 +-
 30 files changed, 3971 insertions(+), 658 deletions(-)

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

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to