The following commit has been merged in the master branch:
commit 7bf10f350aeabfe3c0c6191003af7026b2046b2c
Merge: 73a69e56b76f311d29e6dd1f10c39e414846d1a8 
4a84d37d0b6e54a64ca401ef4bb629f49daaee80
Author: Markus Wanner <mar...@bluegap.ch>
Date:   Wed Oct 2 21:09:00 2013 +0200

    Merge branch 'upstream' - keeping all debian specific files as they
    are.
    
    Conflicts:
        debian/changelog
        debian/control
        debian/control.in
        debian/patches/series


-- 
Geometry engine for Geographic Information Systems

_______________________________________________
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