From: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Date: Thu, 8 Mar 2012 18:13:12 +0000 (+0200)
Subject: Merge tag 'upstream/2_rc2+svn358' into experimental
X-Git-Tag: archive/raspbian/2.5-2+rpi1^2~193^2~7^2~54
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5595be27a5181b97aabf8cfb7a3b0c6891152127;p=mathgl.git

Merge tag 'upstream/2_rc2+svn358' into experimental

Upstream version 2~rc2+svn358

Conflicts:
	CMakeLists.txt
	examples/full_test.cpp
	include/mgl/base.h
	include/mgl/base_cf.h
	include/mgl/canvas_cf.h
	include/mgl/define.h
	include/mgl/mgl.h
	include/mgl/parser.h
	include/mgl/qt.h
	lang/CMakeLists.txt
	src/axis.cpp
	src/base.cpp
	src/base_cf.cpp
	src/canvas.cpp
	src/data.cpp
	src/parser.cpp
	src/pixel.cpp
	texinfo/CMakeLists.txt
	todo.txt
	udav/CMakeLists.txt
	udav/qmglcanvas.cpp
	udav/qmglcanvas.h
	utils/mglconv.cpp
	widgets/fltk.cpp
	widgets/qt.cpp
---

5595be27a5181b97aabf8cfb7a3b0c6891152127