Merge 1.0
authorCarl Hetherington <cth@carlh.net>
Sat, 28 Dec 2013 15:09:30 +0000 (15:09 +0000)
committerCarl Hetherington <cth@carlh.net>
Sat, 28 Dec 2013 15:09:30 +0000 (15:09 +0000)
commit521c09170d9e62cd72cc2da66c41816761008a4b
tree267f5cb83ba72a1d489f32ba3c94d5ac02579a4e
parent0987c41ac468fd93bbb444093e66d5d6753cb927
parentaf3e8ed8382cdc35e361cdca1f735a379fce1317
Merge 1.0
src/lib/content.cc
src/lib/content.h
src/lib/film.cc
src/lib/film.h
src/lib/image_decoder.cc
src/lib/playlist.cc
src/lib/playlist.h
src/wx/film_editor.cc