Merge master.
authorCarl Hetherington <cth@carlh.net>
Mon, 17 Mar 2014 11:25:32 +0000 (11:25 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 17 Mar 2014 11:25:32 +0000 (11:25 +0000)
commit1f8b45c7fd49714628009f5ed2161fbaa2b4d729
treeef5e6838ef5e2809e4e4bece606ee789df4df53d
parenta6b7ff4fc0ad2d05a7b9a9c56c0e0ec60ec44a4c
parentdb6827cee87a7331e2adc91a852d85dc73856f4d
Merge master.
ChangeLog
src/wx/film_viewer.cc