merge
Serge Steer [Wed, 14 Oct 2009 09:46:26 +0000 (11:46 +0200)]
1  2 
scilab/CHANGES_5.2.X
scilab/Version.incl
scilab/modules/scicos/demos/scicos_learn.sci
scilab/modules/scicos/demos/scicos_play.sci
scilab/modules/scicos/scicos.iss
scilab/modules/scicos_blocks/scicos_blocks.iss

Simple merge
@@@ -1,1 -1,2 +1,1 @@@
- SCIVERSION=Scilab-Branch-scicos-GIT
 -SCIVERSION=Scilab-master-GIT
 -
++SCIVERSION=Scilab-Branch-scicos-GIT
Simple merge