[mathgl] 02/05: Merge tag 'upstream/2.2.1+svn921'

[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 543e89e085de1eeb649f447cd11c27b3f96b2c19
Merge: c8abaec e62725c
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Sun Feb 23 18:53:03 2014 +0200

    Merge tag 'upstream/2.2.1+svn921'
    
    Upstream version 2.2.1+svn921
    
    Conflicts:
    	CMakeLists.txt

 AUTHORS                  |   3 +-
 CMakeLists.txt           |  33 +++----
 ChangeLog.txt            |  10 ++
 README                   |  61 ++----------
 clean-svn                |   3 +
 examples/full_test.cpp   |   7 +-
 include/mgl2/addon.h     |   4 +-
 include/mgl2/base.h      |   2 +-
 include/mgl2/canvas_cf.h |   4 +-
 include/mgl2/data_cf.h   |   6 +-
 include/mgl2/datac.h     |   2 +
 include/mgl2/datac_cf.h  |  18 +++-
 include/mgl2/define.h    |  13 ++-
 include/mgl2/glut.h      |  36 +++++++
 include/mgl2/mgl.h       |   5 +
 include/mgl2/plot.h      |   3 +
 include/mgl2/prim.h      |   2 +-
 include/mgl2/type.h      |   2 +-
 src/addon.cpp            |  39 ++++----
 src/base.cpp             |  20 ++--
 src/base_cf.cpp          |   2 +-
 src/canvas.cpp           |  14 +--
 src/canvas_cf.cpp        |   4 +-
 src/complex.cpp          |  59 ++++++++++++
 src/complex_io.cpp       |  16 ++--
 src/data.cpp             |   5 +-
 src/data_io.cpp          |  17 ++--
 src/eval.cpp             |   6 +-
 src/evalc.cpp            |   8 ++
 src/exec.cpp             |   6 +-
 src/export_2d.cpp        | 243 +++++++++++++++--------------------------------
 src/export_3d.cpp        |  27 +++++-
 src/fit.cpp              |  16 ++--
 src/parser.cpp           |   4 +-
 src/pixel.cpp            |  12 ++-
 src/plot.cpp             |  60 +++++++++++-
 src/surf.cpp             |  23 +++--
 src/vect.cpp             |   2 +-
 src/volume.cpp           |  18 ++--
 texinfo/deflate.min.js   |  32 -------
 texinfo/gunzip.min.js    |  29 ------
 texinfo/inflate.min.js   |  26 -----
 texinfo/overview_en.texi |   4 +-
 texinfo/overview_ru.texi |   4 +-
 texinfo/version.texi     |   2 +-
 texinfo/web_en.texi      |  16 ++--
 texinfo/web_fr.texi      |   6 +-
 texinfo/web_ru.texi      |  16 ++--
 todo.txt                 |   9 ++
 udav/CMakeLists.txt      |   5 +
 widgets/glut.cpp         |  27 +++++-
 51 files changed, 527 insertions(+), 464 deletions(-)

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