summaryrefslogtreecommitdiffstats
path: root/scilab/Version.incl
diff options
context:
space:
mode:
authorBruno JOFRET <bruno.jofret@scilab.org>2009-02-24 18:11:54 +0100
committerBruno JOFRET <bruno.jofret@scilab.org>2009-02-24 18:11:54 +0100
commitf63a6bea058012dcbc23cf1617e4e72775a804ee (patch)
tree01728253b09457d6cdd65232122030d768dc1f23 /scilab/Version.incl
parent4490732d56743fd76881adc2ba48b3e1e7311a49 (diff)
parent48ac73b77e617cd1f275b6552717f2a6d9f07eec (diff)
downloadscilab-f63a6bea058012dcbc23cf1617e4e72775a804ee.zip
scilab-f63a6bea058012dcbc23cf1617e4e72775a804ee.tar.gz
Merge commit 'origin/master' into scicos
Conflicts: scilab/Version.incl scilab/modules/core/includes/version.h
Diffstat (limited to 'scilab/Version.incl')
-rw-r--r--scilab/Version.incl2
1 files changed, 1 insertions, 1 deletions
diff --git a/scilab/Version.incl b/scilab/Version.incl
index 7f908e2..5b10acc 100644
--- a/scilab/Version.incl
+++ b/scilab/Version.incl
@@ -1 +1 @@
SCIVERSION=Scilab-Branch-scicos-GIT SCIVERSION=Scilab-Branch-scicos-GIT \ No newline at end of file