[openstreetmap-map-icons] 54/87: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-osm/openstreetmap-map-icons
Bas Couwenberg
sebastic at xs4all.nl
Sat Oct 18 14:07:40 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository openstreetmap-map-icons.
commit 205faab889526dd07b98a2127ff078302ea87b15
Merge: e740e79 74ca0f4
Author: David Paleino <dapal at debian.org>
Date: Sun Feb 20 17:10:10 2011 +0100
Merge branch 'master' of git+ssh://git.debian.org/git/pkg-osm/openstreetmap-map-icons
Conflicts:
debian/changelog
debian/changelog | 10 +++++++++-
debian/control | 2 +-
debian/copyright | 4 ++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff --cc debian/changelog
index 194e42a,0ab2e2c..c829387
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,15 +1,18 @@@
-openstreetmap-map-icons (1:0.0.svn23763-1) unstable; urgency=low
-
- [ David Paleino ]
- * New SVN snapshot (closes: #590471)
- * Package moved to Debian OpenStreetMap Team -- it has nothing GIS :)
++openstreetmap-map-icons (1:0.0.svn23763-2) UNRELEASED; urgency=low
+
+ [ Giovanni Mascellani ]
+ * Adding my new email address.
+ * Fixing debian/copyright for new year.
+
+ -- Giovanni Mascellani <gio at debian.org> Sun, 20 Feb 2011 11:56:42 +0100
+
+openstreetmap-map-icons (1:0.0.svn23763-1) unstable; urgency=low
+
- * New SVN snapshot
++ * New SVN snapshot (closes: #590471)
+ * Package moved to Debian OpenStreetMap Team -- it has nothing GIS :)
+
+ -- David Paleino <dapal at debian.org> Mon, 03 Jan 2011 10:34:17 +0100
+
openstreetmap-map-icons (1:0.0.svn23649-1) unstable; urgency=low
* New SVN snapshot
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-map-icons.git
More information about the Pkg-grass-devel
mailing list