From: David Gow <david@ingeniumdigital.com>
Date: Mon, 29 Sep 2014 04:28:22 +0000 (+0800)
Subject: Merge branch 'master' of git.ucc.asn.au:ipdf/code
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=ef0af5fd0129161a9e079bd3cd1298b53f1fe11a;p=ipdf%2Fcode.git

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

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

ef0af5fd0129161a9e079bd3cd1298b53f1fe11a