The following commit has been merged in the precise branch: commit d344d2ba10b84821f9c813747d39851da330c756 Merge: dbcf91ecf91d721b8b5e4a5f76d77165cf8f8e43 2f0a1b0be5607f2cb11bc801406ff3e47cf3b6e9 Author: Pirmin Kalberer <p...@sourcepole.ch> Date: Wed Jul 10 23:49:09 2013 +0200
Merge branch 'master' into precise Conflicts: debian/changelog diff --combined debian/changelog index 2fcfd0e,0076e9a..423b2e2 --- a/debian/changelog +++ b/debian/changelog @@@ -1,8 -1,8 +1,14 @@@ - osgearth (2.4.0+dfsg-1~precise1) precise; urgency=low ++osgearth (2.4.0+dfsg-2~precise1) precise; urgency=low + + * Launchpad build for precise. + - -- Pirmin Kalberer <pi_...@sourcepole.ch> Tue, 09 Jul 2013 22:33:29 +0200 ++ -- Pirmin Kalberer <pi_...@sourcepole.ch> Wed, 10 Jul 2013 23:47:25 +0200 ++ + osgearth (2.4.0+dfsg-2) unstable; urgency=low + + * Build-Depends for osgEarthQt + + -- Pirmin Kalberer <pi_...@sourcepole.ch> Wed, 10 Jul 2013 23:40:29 +0200 osgearth (2.4.0+dfsg-1) unstable; urgency=low -- osgEarth terrain rendering toolkit _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel