Merge remote-tracking branch 'origin/master' into JIMS 12/12412/1
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Tue, 3 Sep 2013 07:52:45 +0000 (09:52 +0200)
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Tue, 3 Sep 2013 07:52:45 +0000 (09:52 +0200)
commit7ea57aed802886b15c1bcb204b9ac5bffd256f56
tree66aca19f58dd6dea3750828185147c94d4ad10ab
parent6ce24d5f8e5cd263d2f1072cad5216f98a92994b
parentc74e039c65d497b4b3c900e563dcffdcce2efaa0
Merge remote-tracking branch 'origin/master' into JIMS

Change-Id: Ie2b5976d8741f5b1b6cacfe6f8f271b101005b07
48 files changed:
scilab/CHANGES_5.5.X
scilab/configure.ac
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/api_scilab/src/cpp/api_list.cpp
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/completion/includes/getfields.h
scilab/modules/completion/src/c/getfieldsdictionary.c
scilab/modules/completion/src/cpp/FieldsGetter.hxx
scilab/modules/completion/src/cpp/FieldsManager.cpp
scilab/modules/completion/src/cpp/FieldsManager.hxx
scilab/modules/completion/src/cpp/XMLFieldsGetter.cpp
scilab/modules/completion/src/cpp/XMLFieldsGetter.hxx
scilab/modules/completion/src/cpp/getfields.cpp
scilab/modules/core/includes/callinterf.h
scilab/modules/core/includes/version.h.in
scilab/modules/core/includes/version.h.vc
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/dynamic_gateways.h
scilab/modules/core/src/c/stack2.c
scilab/modules/external_objects/Makefile.am
scilab/modules/external_objects/Makefile.in
scilab/modules/external_objects/etc/external_objects.start
scilab/modules/external_objects/includes/ExternalObjects.h
scilab/modules/external_objects/includes/ScilabAbstractEnvironment.hxx
scilab/modules/external_objects/includes/ScilabAbstractEnvironmentWrapper.hxx
scilab/modules/external_objects/includes/ScilabAbstractMemoryAllocator.hxx
scilab/modules/external_objects/includes/ScilabAutoCleaner.hxx
scilab/modules/external_objects/includes/ScilabGateway.hxx
scilab/modules/external_objects/includes/ScilabGatewayOptions.hxx
scilab/modules/external_objects/includes/ScilabObjects.hxx
scilab/modules/external_objects/includes/ScilabOptionsSetter.hxx
scilab/modules/external_objects/src/cpp/ScilabAutoCleaner.cpp
scilab/modules/external_objects/src/cpp/ScilabObjects.cpp
scilab/modules/external_objects/src/cpp/compile.cpp
scilab/modules/external_objects/src/cpp/doubleExclam_invoke.cpp
scilab/modules/external_objects/src/cpp/invoke.cpp
scilab/modules/external_objects/src/cpp/invoke_lu.cpp
scilab/modules/external_objects/src/cpp/invoker.cpp
scilab/modules/external_objects/src/cpp/newInstance.cpp
scilab/modules/external_objects/src/cpp/objectInsert.cpp
scilab/modules/ui_data/src/cpp/BrowseVarManager.cpp
scilab/modules/xml/src/cpp/XMLDocument.hxx
scilab/modules/xml/src/cpp/XMLElement.hxx
scilab/modules/xml/src/cpp/XMLNodeList.hxx
scilab/modules/xml/src/cpp/XMLNs.hxx