projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 881f875 ee63091)
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Tue, 25 Nov 2014 11:00:37 +0000 (11:00 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 25 Nov 2014 11:00:37 +0000 (11:00 +0000)
1  2 
TO_PORT patch | diff1 | diff2 | blob | history

diff --cc TO_PORT
Simple merge
2.0 development branch of dcpomatic