Painfully merge branch 'master' of git.ucc.asn.au:ipdf/code
authorDavid Gow <david@ingeniumdigital.com>
Sun, 5 Oct 2014 04:33:48 +0000 (12:33 +0800)
committerDavid Gow <david@ingeniumdigital.com>
Sun, 5 Oct 2014 04:33:48 +0000 (12:33 +0800)
commita54254dcb23c8db9b78d5bd42e1ca54efda4c8e8
treebb2869c94afe5b35597e4497e583b4d356950d02
parent1a234dbfe3aaa80894807d1a9f4a2abeb3ad1411
parent25548aa3a2c3fd86202b01a88df6abd820a9eb6d
Painfully merge branch 'master' of git.ucc.asn.au:ipdf/code

Conflicts:
src/document.cpp
src/document.cpp

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