Merge commit 'origin/master' into scicos
authorBruno JOFRET <bruno.jofret@scilab.org>
Tue, 24 Feb 2009 17:11:54 +0000 (18:11 +0100)
committerBruno JOFRET <bruno.jofret@scilab.org>
Tue, 24 Feb 2009 17:11:54 +0000 (18:11 +0100)
commitf63a6bea058012dcbc23cf1617e4e72775a804ee
tree01728253b09457d6cdd65232122030d768dc1f23
parent4490732d56743fd76881adc2ba48b3e1e7311a49
parent48ac73b77e617cd1f275b6552717f2a6d9f07eec
Merge commit 'origin/master' into scicos

Conflicts:

scilab/Version.incl
scilab/modules/core/includes/version.h
scilab/Version.incl
scilab/modules/core/includes/version.h