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)
commit67fbce330b046b1f0d63222f04d83410dc1b2faa
treeb7c8ebcbb18951dd76aca92880ee26b689f490c2
parent441976b6cd6631af1d77fc60efc56948c562be1a
parent85336af25da0c613460bbeda4ff7553933e13064
Merge branch 'master' of git.ucc.asn.au:ipdf/code

Conflicts:
src/document.cpp
src/bezier.h
src/document.cpp

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