projects / libdcp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ce517d 2ad4929)
Merge branch 'master' of /home/carl/git/libdcp
authorCarl Hetherington <cth@carlh.net>
Tue, 16 Apr 2013 12:36:22 +0000 (13:36 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 16 Apr 2013 12:36:22 +0000 (13:36 +0100)
1  2 
src/types.h patch | diff1 | diff2 | blob | history
tools/dcpdiff.cc patch | diff1 | diff2 | blob | history

diff --cc src/types.h
Simple merge
diff --cc tools/dcpdiff.cc
Simple merge
C++ library for handling digital cinema packages (DCPs).