Merge branch 'master' of git.ucc.asn.au:ipdf/code
authorDavid Gow <david@ingeniumdigital.com>
Mon, 25 Aug 2014 08:54:46 +0000 (16:54 +0800)
committerDavid Gow <david@ingeniumdigital.com>
Mon, 25 Aug 2014 08:54:46 +0000 (16:54 +0800)
Conflicts:
src/document.cpp

1  2 
src/bezier.h
src/document.cpp

diff --cc src/bezier.h
Simple merge
Simple merge

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