Merge branch 'staging' of ssh://houllier/home/carl/git/dvdomatic into staging
authorCarl Hetherington <cth@carlh.net>
Sat, 20 Apr 2013 01:27:27 +0000 (02:27 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 20 Apr 2013 01:27:27 +0000 (02:27 +0100)
commitd40ebb82f62ab3d826e43e8d1187be9b768e535f
treea34702b3ca85cdff7101825723e9827483db38f2
parent98499a61e17e68c438e56fd8854081a4c98b15ad
parent45747c8dce6448cc6b6c797ae04f3e5fc3b741e8
Merge branch 'staging' of ssh://houllier/home/carl/git/dvdomatic into staging
src/wx/film_viewer.cc