Merge master.
authorCarl Hetherington <cth@carlh.net>
Sat, 15 Jun 2013 16:05:58 +0000 (17:05 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 15 Jun 2013 16:05:58 +0000 (17:05 +0100)
commita183c1776cfd020a37d028ebb0f641352f49697b
treedb2fdafe7fe071f2e50264317e2c4de6b6806f29
parent11d0d8d07917543d6c40a6bb1fe5581ae216f5aa
parent4fe7c89e54205c56f0fba2da24db66734ce23674
Merge master.
30 files changed:
cscript
icons/make_icns.sh
platform/linux/dvdomatic.desktop.in
platform/linux/dvdomatic_batch.desktop.in
platform/linux/servomatic.desktop.in
platform/linux/wscript
platform/osx/Info.plist.in
platform/osx/make_dmg.sh
platform/windows/installer.nsi.32.in
platform/windows/installer.nsi.64.in
run/dvdomatic-osx
run/dvdomatic_batch
src/lib/ab_transcode_job.cc
src/lib/cross.cc
src/lib/cross.h
src/lib/film.cc
src/lib/image.cc
src/lib/imagemagick_content.h
src/lib/player.cc
src/lib/util.cc
src/lib/util.h
src/tools/dcpomatic.cc
src/tools/dcpomatic_batch.cc
src/tools/po/es_ES.po
src/wx/about_dialog.cc
src/wx/po/es_ES.po
src/wx/wscript
test/make_black_test.cc
test/test.cc
wscript