Merge branch 'master' of git.ucc.asn.au:ipdf/code

author David Gow <[email protected]>

Mon, 25 Aug 2014 08:54:46 +0000 (16:54 +0800)

committer David Gow <[email protected]>

Mon, 25 Aug 2014 08:54:46 +0000 (16:54 +0800)
author David Gow <[email protected]>
Mon, 25 Aug 2014 08:54:46 +0000 (16:54 +0800)
committer David Gow <[email protected]>
Mon, 25 Aug 2014 08:54:46 +0000 (16:54 +0800)
diff --cc src/bezier.h
Simple merge
diff --cc src/document.cpp
Simple merge
author	David Gow <[email protected]>
	Mon, 25 Aug 2014 08:54:46 +0000 (16:54 +0800)
committer	David Gow <[email protected]>
	Mon, 25 Aug 2014 08:54:46 +0000 (16:54 +0800)
		1	2
src/bezier.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/document.cpp	patch \|	diff1 \|	diff2 \|	blob \| history