]> git.decadent.org.uk Git - videolink.git/commit
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)
commitcd758c798d0c48f8161e5102faf8d862ba76aa2d
tree449488ef3d720968830eb5722dd07df6a691caa2
parentb4878dceb480836e59032998bf1214f4f015d5ae
parent18bbbeb1492d2776332f54a57b2a681eb45396ad
Merge remote branch 'jcristau/master'

Update ChangeLog based on debian/changelog entry 1.2.9-2.1.

Resolve conflict on setting of moz_ldflags_extra in Makefile.
ChangeLog
Makefile