Merge branch 'master' of git.ucc.asn.au:ipdf/code
authorDavid Gow <david@ingeniumdigital.com>
Mon, 29 Sep 2014 04:28:22 +0000 (12:28 +0800)
committerDavid Gow <david@ingeniumdigital.com>
Mon, 29 Sep 2014 04:28:22 +0000 (12:28 +0800)
commitef0af5fd0129161a9e079bd3cd1298b53f1fe11a
tree47bae504a35bf0a91fceac59b9808871002809dd
parentfe80b0a479a44182b6e7e982fb6ff33b6e17303d
parent58a6719da2337b3e6e20b581885f170bbe5fc480
Merge branch 'master' of git.ucc.asn.au:ipdf/code

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

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