Fix merge problem 54/5354/1
authorVincent COUVERT <vincent.couvert@scilab.org>
Fri, 4 Nov 2011 13:36:32 +0000 (14:36 +0100)
committerVincent COUVERT <vincent.couvert@scilab.org>
Fri, 4 Nov 2011 13:36:32 +0000 (14:36 +0100)
commitbd82bf3a315d66e7de0405a7dcca55dd1ec1fc62
tree180ab6f73ae39fd351bf0a7350be088b8d3707bb
parentaf3637f0581eb03c70601304712b09677a20350f
Fix merge problem

Change-Id: I764e1300888c5a1a16cfa90f7ccf21aa09a69f22
scilab/Version.incl