Fix merge problem 54/5354/1
Vincent COUVERT [Fri, 4 Nov 2011 13:36:32 +0000 (14:36 +0100)]
Change-Id: I764e1300888c5a1a16cfa90f7ccf21aa09a69f22

scilab/Version.incl

index 198aec9..d66dd00 100644 (file)
@@ -1 +1 @@
-SCIVERSION=Scilab-Branch-desktop-GIT
+SCIVERSION=Scilab-Branch-master-GIT