Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic
authorCarl Hetherington <cth@carlh.net>
Thu, 27 Jun 2013 16:08:01 +0000 (17:08 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 27 Jun 2013 16:08:01 +0000 (17:08 +0100)
1  2 
src/lib/cross.cc

Simple merge