Merge master.
authorCarl Hetherington <cth@carlh.net>
Tue, 16 Sep 2014 22:26:55 +0000 (23:26 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 16 Sep 2014 22:26:55 +0000 (23:26 +0100)
commit1c13441a19aa387ddd8ac0c972207ccbbe3114d8
treed4586111dd83ea3731b81bd5002898b3fa3f5652
parent3e12c68dc0451e73b5bc1a84d1d70f4999f7b4b5
parent93510d31e7ae2cadf2de076d4bef60ca3f381a35
Merge master.
ChangeLog
debian/changelog
src/lib/audio_decoder.cc
src/wx/about_dialog.cc
src/wx/wx_util.cc