[mathgl] 01/03: Merge tag 'upstream/2.2.2+svn930'

[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 7380130cd2719cce18008a4eb9b98fe761a708dc
Merge: 408b4b8 ab9a373
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Sat Mar 15 11:41:43 2014 +0200

    Merge tag 'upstream/2.2.2+svn930'
    
    Upstream version 2.2.2+svn930

 CMakeLists.txt            |   27 +-
 ChangeLog.txt             |   12 +-
 examples/fltk_example.cpp |   75 ++-
 examples/full_test.cpp    |   10 +
 examples/glut_example.cpp |   64 ++-
 examples/qt_example.cpp   |   81 ++-
 examples/samples.cpp      |    4 +-
 include/mgl2/data.h       |    2 -
 include/mgl2/datac.h      |    6 +-
 include/mgl2/define.h     |    5 +
 include/mgl2/glut.h       |    1 +
 json/index.html           |    2 +-
 json/sylvester.js         |    1 -
 json/sylvester.src.js     | 1254 +++++++++++++++++++++++++++++++++++++++++++++
 src/axis.cpp              |    6 +-
 src/base.cpp              |    6 +-
 src/data.cpp              |    6 +-
 src/data_io.cpp           |   22 +-
 src/data_png.cpp          |    2 +-
 src/export_2d.cpp         |    4 +-
 src/vect.cpp              |    4 +-
 texinfo/core_en.texi      |    5 +
 texinfo/core_ru.texi      |    5 +
 texinfo/example_en.texi   |   48 +-
 texinfo/example_ru.texi   |  101 ++--
 texinfo/version.texi      |    2 +-
 texinfo/version_hist.txt  |    5 +
 texinfo/web_en.texi       |   14 +
 texinfo/web_ru.texi       |   14 +
 todo.txt                  |   19 +-
 widgets/glut.cpp          |    4 +-
 31 files changed, 1622 insertions(+), 189 deletions(-)

diff --cc CMakeLists.txt
index 2544894,f279dce..4aa93ee
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -9,12 -9,9 +9,12 @@@ endif(NOT CMAKE_BUILD_TYPE
  
  set(CMAKE_VERBOSE_MAKEFILE ON)
  set(MathGL_VERSION_MAJOR 2)
- set(MathGL_VERSION_MINOR 2.1)
+ set(MathGL_VERSION_MINOR 2.2)
  set(MathGL_SOVERSION 7.2.0)
  
 +set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro")
 +set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,relro")
 +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro")
  
  MACRO(MGL_DEPENDENT_OPTION option doc default depends1 force1 depends2 force2)
    IF(${option}_ISSET MATCHES "^${option}_ISSET$")

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