Merge branch '0.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Tue, 22 Jul 2014 18:52:49 +0000 (19:52 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 22 Jul 2014 18:52:49 +0000 (19:52 +0100)
commit30ba2bbc24e4f8e0e2baa2c37380d83cafa4a082
tree6e3dcb35b400c3b6630874a0abe2a43479216039
parent994d0831b21e1a17d56d7e9d8e167e65a7166cbf
parent92cd2c3109e1957d9ca20646d1577993259118f0
Merge branch '0.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0