Merge 1.0.
authorCarl Hetherington <cth@carlh.net>
Thu, 24 Oct 2013 08:29:28 +0000 (09:29 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 24 Oct 2013 08:29:28 +0000 (09:29 +0100)
commitf0d7baf0ce956fe5461caa91868c41d881b5f0dc
tree946d9fe2be68a6049ea4835d7edf825c491dd02c
parent0e2c7f060529d93035e89b06d4aa687830a5e0ad
parentf28102477a712b8dde0f157d33b087d642c84555
Merge 1.0.
src/lib/player.cc
src/wx/film_viewer.cc