Merge remote-tracking branch 'origin/master' into JIMS 93/12093/1
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Mon, 22 Jul 2013 12:01:35 +0000 (14:01 +0200)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Mon, 22 Jul 2013 12:01:48 +0000 (14:01 +0200)
commit09ec2fd96b254f41114b136d2fd74f53de495b4f
treea9153ab84e69072503ad6e0206ee1be9d395a8f3
parentf7b4cb73907557876f9348567ca2f2683a4d1291
parent8844de081aa3c30d64eb223d1f46536d56a58bdf
Merge remote-tracking branch 'origin/master' into JIMS

Conflicts:
scilab/Scilab.sln
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

Change-Id: Ibeafbdac30a7b0b184a194d8b271e32666b3ee4b
scilab/CHANGES_5.5.X
scilab/Scilab.sln
scilab/configure
scilab/configure.ac
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/stack2.c
scilab/modules/ui_data/src/cpp/BrowseVarManager.cpp