Merge remote-tracking branch 'origin/master' into YaSp 17/13417/1
authorBruno JOFRET <bruno.jofret@scilab-enterprises.com>
Wed, 8 Jan 2014 10:39:12 +0000 (11:39 +0100)
committerBruno JOFRET <bruno.jofret@scilab-enterprises.com>
Wed, 8 Jan 2014 10:39:12 +0000 (11:39 +0100)
commitffa707a0e26a9a46ee30153ea5579c333c1f68b6
tree46ce66d49ddcd7df545b95a8b41864cc776adc1f
parente244bd5f22aa542b128c3d710112505bf7e9cf1f
parentc610ebdf1233577b06628cd5a1715004bd49d589
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/Makefile.am
scilab/Makefile.in
scilab/modules/startup/src/c/mainscic.cpp

Change-Id: Id51e9ebf7be0027c3902ba0e0c437c23083dc012
scilab/Makefile.am
scilab/Makefile.in
scilab/modules/console/src/c/others/initMacOSXEnv.c
scilab/modules/startup/src/cpp/scilab.cpp
scilab/modules/windows_tools/src/c/CScilex/CScilex.vcxproj
scilab/modules/windows_tools/src/c/CScilex/CScilex.vcxproj.filters
scilab/modules/windows_tools/src/c/WScilex/WScilex.vcxproj
scilab/modules/windows_tools/src/c/WScilex/WScilex.vcxproj.filters