The following commit has been merged in the master branch: commit 16e7f3ad2991c306d3388623467f6d4cc06a614a Merge: c8474f480e2192de822a3795a831a96ed1383818 a5a0cb39f8b6cb82fc49e248aaec0bc5333523ad Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Mon Oct 14 20:05:04 2013 +0200
Merge branch 'master' of http://git.debian.org/git/pkg-grass/libgaiagraphics Conflicts: debian/copyright -- Packaging of libgaiagraphics in Debian _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel