This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository josm.

commit 0e26d838f2c7999a158e3bffbe78da2d4b957e8a
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Fri Oct 30 12:22:12 2015 +0100

    Fix LinkedList import in 02-elemstyles.patch.
---
 debian/patches/02-elemstyles.patch | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/patches/02-elemstyles.patch 
b/debian/patches/02-elemstyles.patch
index 6989936..a392e71 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -69,7 +69,15 @@ Forwarded: not-needed
          });
 --- a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java
 +++ b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java
-@@ -20,6 +20,7 @@ import org.openstreetmap.josm.Main;
+@@ -9,6 +9,7 @@ import java.util.Arrays;
+ import java.util.Collection;
+ import java.util.EnumSet;
+ import java.util.LinkedHashMap;
++import java.util.LinkedList;
+ import java.util.List;
+ import java.util.Map;
+ import java.util.Set;
+@@ -20,6 +21,7 @@ import org.openstreetmap.josm.Main;
  import org.openstreetmap.josm.data.osm.OsmPrimitive;
  import org.openstreetmap.josm.data.osm.Tag;
  import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -77,7 +85,7 @@ Forwarded: not-needed
  import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
  import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
  import org.openstreetmap.josm.tools.ImageProvider;
-@@ -124,11 +125,21 @@ public abstract class TaggingPresetItem
+@@ -124,11 +126,21 @@ public abstract class TaggingPresetItem
      }
  
      protected static ImageIcon loadImageIcon(String iconName, File zipIcons, 
Integer maxSize) {

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/josm.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