From: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Date: Wed, 18 Apr 2012 16:07:37 +0000 (+0300)
Subject: Merge tag 'upstream/2.0' into experimental
X-Git-Tag: archive/raspbian/2.5-2+rpi1^2~193^2~7^2~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b28c7957b6c3d8c5e5b9fa1203cc989f9d83a89e;p=mathgl.git

Merge tag 'upstream/2.0' into experimental

Upstream version 2.0

Conflicts:
	CMakeLists.txt
	lang/CMakeLists.txt
---

b28c7957b6c3d8c5e5b9fa1203cc989f9d83a89e