Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic
authorCarl Hetherington <cth@carlh.net>
Fri, 28 Jun 2013 08:47:55 +0000 (09:47 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 28 Jun 2013 08:47:55 +0000 (09:47 +0100)
commit318d819afd66b76e3ea7ce728452c2fb668c0b80
treef053fd342a84555b98d78eca79b93cf254c028d9
parent409db67a7e665c562b4c46035e6394263a93a7f6
parent1c86e1eaa1115015e7b2c4129a3b4be024939db2
Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic
src/lib/film.cc