projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec9fef7 6028b10)
Merge branch '1.0' of /Users/carl/git/dvdomatic into 1.0
authorCarl Hetherington <cth@carlh.net>
Sun, 13 Oct 2013 12:12:19 +0000 (13:12 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 13 Oct 2013 12:12:19 +0000 (13:12 +0100)
1  2 
ChangeLog patch | diff1 | diff2 | blob | history

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