The following commit has been merged in the master branch:
commit ee6c09f85d2088b0697d16bcc8807189bc5dba55
Merge: de534ba1e86ff595cf4b82103529809b2ada8301 
0f8e4a68566d8ac4a40baa787443257a0e37eaa1
Author: Francesco Paolo Lovergine <fran...@debian.org>
Date:   Tue Dec 10 14:35:34 2013 +0100

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

diff --combined debian/changelog
index 43811b7,e276110..88cda36
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,12 @@@
 -gdal (1.10.1+dfsg-0~exp2) UNRELEASED; urgency=low
 +gdal (1.10.1+dfsg-1) unstable; urgency=medium
  
++  [ Bas Couwenberg ]
+   * Change priority to optional.
+ 
 - -- Bas Couwenberg <sebas...@xs4all.nl>  Fri, 22 Nov 2013 03:29:36 +0100
++  [ Francesco Paolo Lovergine ]
 +  * Ready for unstable.
 +
 + -- Francesco Paolo Lovergine <fran...@debian.org>  Tue, 10 Dec 2013 12:59:27 
+0100
  
  gdal (1.10.1+dfsg-0~exp1) experimental; urgency=low
  

-- 
GDAL/OGR library and tools

_______________________________________________
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