]> git.decadent.org.uk Git - videolink.git/commitdiff
Merge remote branch 'jcristau/master'
authorBen Hutchings <ben@decadent.org.uk>
Mon, 7 Feb 2011 12:31:12 +0000 (12:31 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Mon, 7 Feb 2011 12:31:12 +0000 (12:31 +0000)
Update ChangeLog based on debian/changelog entry 1.2.9-2.1.

Resolve conflict on setting of moz_ldflags_extra in Makefile.


No differences found