main.carlh.net Git - dcpomatic.git/commit

author	Carl Hetherington <cth@carlh.net>
	Sat, 10 May 2014 12:36:19 +0000 (13:36 +0100)
committer	Carl Hetherington <cth@carlh.net>
	Sat, 10 May 2014 12:36:19 +0000 (13:36 +0100)
commit	1b576d63f5b5babda35c3995dd375e39baa16947
tree	ce2f91f3aeba076409d43521606aa20873203b7e	tree \| snapshot
parent	7f3a784849bb94a40480d6a5e6119eb182e93197	commit \| diff
parent	91c4fed2f010077e19ff5f8c57831047827528a7	commit \| diff

Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic

2.0 development branch of dcpomatic