Merge remote-tracking branch 'origin/master' into JIMS 43/12343/1
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Mon, 26 Aug 2013 15:54:39 +0000 (17:54 +0200)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Mon, 26 Aug 2013 15:54:59 +0000 (17:54 +0200)
commitfebf25f3b5c41dbaae398602dd77251ffc8c6a30
treef98212aebd3a02298b53560406383754e218796e
parent30e00da34e5ae683a0600a313db015e21901bc93
parent8213b82bb3ddb1973112e77f8fadd22b903fce7c
Merge remote-tracking branch 'origin/master' into JIMS

Change-Id: If6ecbabf78903548bc6142c83dca2535aaee098e
scilab/CHANGES_5.5.X
scilab/Scilab.sln
scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj
scilab/configure
scilab/configure.ac
scilab/modules/Makefile.in
scilab/modules/completion/Makefile.in
scilab/modules/completion/src/c/completion.vcxproj
scilab/modules/external_objects/Makefile.in
scilab/modules/external_objects/external_objects.vcxproj