Merge master.
authorCarl Hetherington <cth@carlh.net>
Sun, 27 Apr 2014 22:41:26 +0000 (23:41 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 27 Apr 2014 22:41:26 +0000 (23:41 +0100)
commit7f2e74604a51b984e4c8cbb5d5f4bb642677ec00
treebe2da9736a298d9367c8c8f1aa231c43251ccaab
parent243dff6782db2783648c9efc0e6cd17b1c6cdaae
parentab43240870523c96c68493d107b8bc8c5294629b
Merge master.
ChangeLog
cscript
src/lib/image_content.cc
src/lib/job.cc
src/lib/piece.h
src/lib/player.h
src/lib/util.cc
src/wx/film_editor.cc