Merge remote-tracking branch 'remotes/origin/master' into VS2010 94/3994/1
authorAllan CORNET <allan.cornet@scilab.org>
Tue, 10 May 2011 12:27:30 +0000 (14:27 +0200)
committerAllan CORNET <allan.cornet@scilab.org>
Tue, 10 May 2011 12:27:30 +0000 (14:27 +0200)
commit4452a4e8a8d1f64083cf7205c3ebb8243f7fb37f
treeeafdb9be90f32175bc7a9b2d35088fb3f5ba0dd2
parentc7737960745f035da8686cf62a578dc2585576ff
parent4a6da2d84117349998469a463c916b631289a4d4
Merge remote-tracking branch 'remotes/origin/master' into VS2010

Conflicts:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/Visual-Studio-settings/rename-vc-files/rename-vc-files.vcproj
scilab/modules/completion/src/c/completion.vcproj
scilab/modules/core/src/fortran/core_f2c.vcproj
scilab/modules/scicos/src/c/scicos.vcproj
scilab/modules/scicos_blocks/src/c/scicos_blocks.vcproj
scilab/modules/scicos_blocks/src/fortran/scicos_blocks_f2c.vcproj

Change-Id: Ic4bc2351a20e4ffcc0f73454ff204b4d4b9fff07
14 files changed:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/modules/core/src/fortran/core_f2c.vcxproj
scilab/modules/core/src/fortran/core_f2c.vcxproj.filters
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/helptools/sci_gateway/cpp/sci_buildDoc.cpp
scilab/modules/helptools/sci_gateway/cpp/sci_buildDocv2.cpp
scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj
scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj.filters
scilab/modules/scicos_blocks/src/fortran/scicos_blocks_f.vfproj
scilab/modules/scicos_blocks/src/fortran/scicos_blocks_f2c.vcxproj
scilab/modules/scicos_blocks/src/fortran/scicos_blocks_f2c.vcxproj.filters
scilab/modules/windows_tools/src/c/CScilex/CScilex.rc
scilab/modules/windows_tools/src/c/WScilex/WScilex.rc