[SCM] Packaging for mathgl branch, experimental, updated. debian/2_rc2-9-g217120d

Dimitrios Eftaxiopoulos eftaxi12 at otenet.gr
Fri Mar 9 22:48:32 UTC 2012


The following commit has been merged in the experimental branch:
commit 5595be27a5181b97aabf8cfb7a3b0c6891152127
Merge: 4a3c787b0e1458467e6a23344d1cc9d015a52c74 45eb209c8c7b608cea8d0fd8a324ad754470ad6c
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Thu Mar 8 20:13:12 2012 +0200

    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


-- 
Packaging for mathgl



More information about the debian-science-commits mailing list