The following commit has been merged in the master branch:
commit 083f8195a995414aa51c7552170bf3097ee00aa8
Merge: 83c263ed311b537696d98624d347d82ef1e5e334 
41e88c4988b8e884fe99caa68fb2f8d3bee640a0
Author: Francesco P. Lovergine <france...@lovergine.com>
Date:   Tue Sep 17 18:11:21 2013 +0200

    Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/mapserver
    
    Conflicts:
        debian/changelog

diff --combined debian/changelog
index 70209ae,5448985..77ee442
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,11 +1,15 @@@
++<<<<<<< HEAD
 +mapserver (6.4.0~rc1-1) unstable; urgency=low
++=======
+ mapserver (6.4.0-1) UNRELEASED; urgency=low
+ 
+   * New upstream release: 6.4.0.
+   * Drop install-threads.patch, applied upstream.
+ 
+  -- Bas Couwenberg <sebas...@xs4all.nl>  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
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to