Merge master.
authorCarl Hetherington <cth@carlh.net>
Tue, 9 Apr 2013 19:10:31 +0000 (20:10 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 9 Apr 2013 19:10:31 +0000 (20:10 +0100)
commite94cd129dcd66a76210880bfdf19d27f7992651b
tree32bc6dd1d93328762a0db73dbf4e32bf185e3a02
parentd62877ae6c4e316e43f4052e4b9ba673610012cf
parentb8b2fd0b0aeaa1ec95171eaf12c462ff8b555e0e
Merge master.
src/lib/format.cc
src/wx/film_editor.cc
wscript