The following commit has been merged in the master branch:
commit 8fbb4632d78d73f8d63bc50f48d55ba7138fe748
Author: Francesco P. Lovergine <[email protected]>
Date: Tue Sep 17 18:11:51 2013 +0200
Merged with Bas recent update.
diff --git a/debian/changelog b/debian/changelog
index 77ee442..873f5be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,4 @@
-<<<<<<< HEAD
-mapserver (6.4.0~rc1-1) unstable; urgency=low
-=======
-mapserver (6.4.0-1) UNRELEASED; urgency=low
+mapserver (6.4.0-1) unstable; urgency=low
* New upstream release: 6.4.0.
* Drop install-threads.patch, applied upstream.
@@ -9,7 +6,6 @@ mapserver (6.4.0-1) UNRELEASED; urgency=low
-- Bas Couwenberg <[email protected]> Tue, 17 Sep 2013 17:16:30 +0200
mapserver (6.4.0~rc1-1) UNRELEASED; urgency=low
->>>>>>> 41e88c4988b8e884fe99caa68fb2f8d3bee640a0
* New upstream release: 6.4.0-rc1.
* Rename WITH_THREADS to WITH_THREAD_SAFETY.
--
Packaging for MapServer
_______________________________________________
Pkg-grass-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
