Merge remote-tracking branch 'origin/master' into JIMS 93/12093/1
Antoine ELIAS [Mon, 22 Jul 2013 12:01:35 +0000 (14:01 +0200)]
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

1  2 
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

Simple merge
@@@ -501,8 -502,13 +502,15 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external_objects", "modules\external_objects\external_objects.vcxproj", "{3142E52C-309A-41D9-BD12-7B7E9E3BDD44}"
  EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external_objects_java", "modules\external_objects_java\external_objects_java.vcxproj", "{C51BA525-D7C8-4385-862D-F8E67187B827}"
 +EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos-cli", "modules\scicos\src\c\cli\scicos-cli.vcxproj", "{A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}"
+       ProjectSection(ProjectDependencies) = postProject
+               {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
+       EndProjectSection
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos_blocks-cli", "modules\scicos_blocks\src\c\cli\scicos_blocks-cli.vcxproj", "{424A5578-BA28-435F-8313-8D85886A3539}"
+ EndProject
  Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
                {3142E52C-309A-41D9-BD12-7B7E9E3BDD44}.Release|Win32.Build.0 = Release|Win32
                {3142E52C-309A-41D9-BD12-7B7E9E3BDD44}.Release|x64.ActiveCfg = Release|x64
                {3142E52C-309A-41D9-BD12-7B7E9E3BDD44}.Release|x64.Build.0 = Release|x64
 +              {C51BA525-D7C8-4385-862D-F8E67187B827}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {C51BA525-D7C8-4385-862D-F8E67187B827}.Debug|Win32.Build.0 = Debug|Win32
 +              {C51BA525-D7C8-4385-862D-F8E67187B827}.Debug|x64.ActiveCfg = Debug|x64
 +              {C51BA525-D7C8-4385-862D-F8E67187B827}.Debug|x64.Build.0 = Debug|x64
 +              {C51BA525-D7C8-4385-862D-F8E67187B827}.Release|Win32.ActiveCfg = Release|Win32
 +              {C51BA525-D7C8-4385-862D-F8E67187B827}.Release|Win32.Build.0 = Release|Win32
 +              {C51BA525-D7C8-4385-862D-F8E67187B827}.Release|x64.ActiveCfg = Release|x64
 +              {C51BA525-D7C8-4385-862D-F8E67187B827}.Release|x64.Build.0 = Release|x64
+               {A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}.Debug|Win32.ActiveCfg = Debug|Win32
+               {A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}.Debug|Win32.Build.0 = Debug|Win32
+               {A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}.Debug|x64.ActiveCfg = Debug|x64
+               {A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}.Debug|x64.Build.0 = Debug|x64
+               {A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}.Release|Win32.ActiveCfg = Release|Win32
+               {A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}.Release|Win32.Build.0 = Release|Win32
+               {A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}.Release|x64.ActiveCfg = Release|x64
+               {A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}.Release|x64.Build.0 = Release|x64
+               {424A5578-BA28-435F-8313-8D85886A3539}.Debug|Win32.ActiveCfg = Debug|Win32
+               {424A5578-BA28-435F-8313-8D85886A3539}.Debug|Win32.Build.0 = Debug|Win32
+               {424A5578-BA28-435F-8313-8D85886A3539}.Debug|x64.ActiveCfg = Debug|x64
+               {424A5578-BA28-435F-8313-8D85886A3539}.Debug|x64.Build.0 = Debug|x64
+               {424A5578-BA28-435F-8313-8D85886A3539}.Release|Win32.ActiveCfg = Release|Win32
+               {424A5578-BA28-435F-8313-8D85886A3539}.Release|Win32.Build.0 = Release|Win32
+               {424A5578-BA28-435F-8313-8D85886A3539}.Release|x64.ActiveCfg = Release|x64
+               {424A5578-BA28-435F-8313-8D85886A3539}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
Simple merge
Simple merge
Simple merge