Merge branch 'master' into 2.0
authorCarl Hetherington <cth@carlh.net>
Wed, 5 Mar 2014 16:20:23 +0000 (16:20 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 5 Mar 2014 16:20:23 +0000 (16:20 +0000)
commit79ce26d031d109177ba4b0f637fa2960345a37a3
tree987dbb3419f779fbd8192795898f3f93d0291efe
parenta79d78d8bb6d51f6662f1f63b9f8fd19e1a0c5f1
parenta476ad31d447b8436326ba1bf448471f321a3ca9
Merge branch 'master' into 2.0
src/lib/film.cc
src/lib/job.cc
src/lib/util.cc
src/lib/util.h
src/lib/wscript
src/wx/audio_mapping_view.cc
wscript