Merge master.
authorCarl Hetherington <cth@carlh.net>
Thu, 9 May 2013 14:14:08 +0000 (15:14 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 9 May 2013 14:14:08 +0000 (15:14 +0100)
commit92cafb6fc686a041354da2eabde6bcb2f6846e1d
treecdc26dde96d8c9ed1e9c60056a404ca3df2dcfac
parentfd040c2bd27fde35424a384174ecb56c643764cd
parent6e5c4e570f26e05124ab0ef67e39c07bab9cb4d5
Merge master.
13 files changed:
src/lib/job.cc
src/lib/job.h
src/lib/util.cc
src/lib/util.h
src/tools/dcpomatic.cc
src/tools/wscript
src/wx/job_manager_view.cc
src/wx/job_manager_view.h
src/wx/wx_util.cc
src/wx/wx_util.h
windows/installer.nsi.32.in
windows/installer.nsi.64.in
wscript