[mathgl] 01/03: Merge tag 'upstream/2.2.2.1'

[Dimitrios Eftaxiopoulos]

This is an automated email from the git hooks/post-receive script.

eftaxiop-guest pushed a commit to branch master
in repository mathgl.

commit 90d9fb461900459418d7480b76a9bf8878447a07
Merge: bc25e85 f4f4a0b
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Mon Mar 24 00:59:56 2014 +0200

    Merge tag 'upstream/2.2.2.1'
    
    Upstream version 2.2.2.1
    
    Conflicts:
    	CMakeLists.txt

 CMakeLists.txt             | 41 ++++++++++++++++++++---------------------
 ChangeLog.txt              |  8 ++++++++
 clean-svn                  |  3 ---
 cmake-qt4.txt              |  4 ++++
 cmake-qt5.txt              | 13 ++++++++-----
 examples/full_test.cpp     | 22 ++++++++++++++++++++++
 examples/samples.cpp       |  2 +-
 examples/wx_example.cpp    |  6 +++---
 include/mgl2/addon.h       |  2 ++
 include/mgl2/define.h      | 25 +++++++++++++++++++++----
 include/mgl2/glut.h        |  2 +-
 json/CMakeLists.txt        |  4 ++--
 src/addon.cpp              |  6 ++++--
 src/base.cpp               | 24 ++++++++++++++++++++----
 src/complex.cpp            |  8 ++++----
 src/complex_io.cpp         |  2 +-
 src/eval.cpp               |  2 +-
 src/exec.cpp               | 12 ++++++------
 src/font.cpp               |  4 ++--
 src/interp.hpp             |  4 ++--
 src/s_hull/s_hull_pro.cpp  |  6 +++---
 texinfo/core_en.texi       | 12 +++++++-----
 texinfo/core_ru.texi       | 12 +++++++-----
 texinfo/web_en.texi        | 12 ++++++++++++
 texinfo/web_ru.texi        | 13 +++++++++++++
 todo.txt                   |  3 ++-
 udav/CMakeLists.txt        |  2 +-
 utils/CMakeLists.txt       |  2 +-
 utils/mglcgi.cpp           |  2 +-
 widgets/qt5/CMakeLists.txt |  8 ++++----
 widgets/wx.cpp             | 10 +++++-----
 31 files changed, 188 insertions(+), 88 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mathgl.git