merge with master 52/3452/1
authorAllan CORNET <allan.cornet@scilab.org>
Tue, 8 Mar 2011 12:52:39 +0000 (13:52 +0100)
committerAllan CORNET <allan.cornet@scilab.org>
Tue, 8 Mar 2011 12:52:39 +0000 (13:52 +0100)
commitef2133a6b1535a3e5520b039a9b9356550a4ff39
tree62883b544688928def885ff73ae30e342d8032cf
parent9db4126172185d2102e91fc4e1cda6b656cd582b
parenta41c627d7dab3a804e62dcc2cc89bcbf683363c9
merge with master

Change-Id: Ia10d965dceca80cb8c1201b816aee3d506746668
scilab/.gitignore
scilab/CHANGES_5.4.X
scilab/Visual-Studio-settings/rename-vc-files/rename-vc-files.vcxproj
scilab/Visual-Studio-settings/rename-vc-files/rename-vc-files.vcxproj.filters
scilab/modules/core/src/c/core.vcxproj
scilab/modules/core/src/c/core.vcxproj.filters
scilab/modules/helptools/sci_gateway/cpp/sci_buildDocv2.cpp
scilab/modules/helptools/src/BuildHelp.vcxproj
scilab/modules/scicos/src/c/scicos.vcxproj
scilab/modules/scicos/src/c/scicos.vcxproj.filters
scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java