Merge master.
authorCarl Hetherington <cth@carlh.net>
Tue, 4 Dec 2012 19:51:03 +0000 (19:51 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 4 Dec 2012 19:51:03 +0000 (19:51 +0000)
commit288e7e64e9be84b8dbe11f5acb490e64a29d9378
tree4535e3c21804444e50eb2fbbf03699fb941a40bd
parent3ba89a00859e8108017a0d6f2275f0658173b80f
parent3e915b00219ee8c97e50bbc775d90d0dddce87b6
Merge master.
ChangeLog
release
src/lib/config.h
src/lib/encoder.h
src/lib/film.h
src/lib/util.cc
src/lib/wscript
src/wx/film_editor.cc
wscript