Merge master.
authorCarl Hetherington <cth@carlh.net>
Wed, 22 Oct 2014 09:10:54 +0000 (10:10 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 22 Oct 2014 09:10:54 +0000 (10:10 +0100)
commitf90d74f7a0382f0dc63eef81bd553d7a7b38edb2
treeb4f495accfc6f697563ec1931e75acd5c8b89ce4
parent4b06a77805ea3fd7bc0829d8096f87b341c77832
parenta7601beaa8983c9d012d9230ce66aa861f34e67f
Merge master.
ChangeLog
debian/changelog
src/lib/ffmpeg.cc
src/wx/about_dialog.cc