git.ucc.asn.au / ipdf / code.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 457682a bb2746f)
Merge branch 'master' of git.ucc.asn.au:/ipdf/code
authorSam Moore <[email protected]>
Thu, 7 Aug 2014 02:46:46 +0000 (10:46 +0800)
committerSam Moore <[email protected]>
Thu, 7 Aug 2014 02:46:46 +0000 (10:46 +0800)
Dammit I hate merges

1  2 
src/document.cpp patch | diff1 | diff2 | blob | history

diff --cc src/document.cpp
Simple merge
Infinite Precision Document Formats - Code base

UCC git Repository :: git.ucc.asn.au