summaryrefslogtreecommitdiffstats
path: root/scilab/Scilab_f2c.sln
diff options
context:
space:
mode:
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>2012-07-24 18:41:33 +0200
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>2012-07-25 08:56:56 +0200
commit7b880260d8829659ab9df0bc34f3bf43267303fd (patch)
treef075bf32ca379ce53377d92c33326816978c6839 /scilab/Scilab_f2c.sln
parent66343cd1cafc6255ef42efc742ea25ec03d66eab (diff)
parent144dfc40cc515529a7720442173e14d794d74a5f (diff)
downloadscilab-7b880260d8829659ab9df0bc34f3bf43267303fd.zip
scilab-7b880260d8829659ab9df0bc34f3bf43267303fd.tar.gz
Merge remote-tracking branch 'origin/master' into YaSp
Conflicts: scilab/Scilab.sln scilab/configure scilab/etc/modules.xml.in scilab/modules/Makefile.am scilab/modules/Makefile.in scilab/modules/api_scilab/src/cpp/api_common.cpp scilab/modules/core/Makefile.am scilab/modules/core/Makefile.in scilab/modules/core/includes/machine.h.in scilab/modules/core/src/c/callinterf.c scilab/modules/core/src/c/core.vcxproj scilab/modules/core/src/c/core.vcxproj.filters scilab/modules/core/src/c/dynamic_gateways.c scilab/modules/core/src/c/parse.c scilab/tools/innosetup/code_modules.iss scilab/tools/innosetup/components.iss Change-Id: Ia5fc09bc975e9b1a7385cc49ce1b6820692f34f3
Diffstat (limited to 'scilab/Scilab_f2c.sln')
-rw-r--r--scilab/Scilab_f2c.sln10
1 files changed, 10 insertions, 0 deletions
diff --git a/scilab/Scilab_f2c.sln b/scilab/Scilab_f2c.sln
index 7e465f6..b4f7574 100644
--- a/scilab/Scilab_f2c.sln
+++ b/scilab/Scilab_f2c.sln
@@ -629,6 +629,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gui_gw", "modules\gui\sci_g
629EndProject 629EndProject
630Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics_gw", "modules\graphics\sci_gateway\cpp\graphics_gw.vcxproj", "{61B23D9B-3F73-4204-98F7-6F41218F4564}" 630Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics_gw", "modules\graphics\sci_gateway\cpp\graphics_gw.vcxproj", "{61B23D9B-3F73-4204-98F7-6F41218F4564}"
631EndProject 631EndProject
632Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external_objects", "modules\external_objects\external_objects.vcxproj", "{3142E52C-309A-41D9-BD12-7B7E9E3BDD44}"
633EndProject
632Global 634Global
633 GlobalSection(SolutionConfigurationPlatforms) = preSolution 635 GlobalSection(SolutionConfigurationPlatforms) = preSolution
634 Debug|Win32 = Debug|Win32 636 Debug|Win32 = Debug|Win32
@@ -1917,6 +1919,14 @@ Global
1917 {61B23D9B-3F73-4204-98F7-6F41218F4564}.Release|Win32.Build.0 = Release|Win32 1919 {61B23D9B-3F73-4204-98F7-6F41218F4564}.Release|Win32.Build.0 = Release|Win32
1918 {61B23D9B-3F73-4204-98F7-6F41218F4564}.Release|x64.ActiveCfg = Release|x64 1920 {61B23D9B-3F73-4204-98F7-6F41218F4564}.Release|x64.ActiveCfg = Release|x64
1919 {61B23D9B-3F73-4204-98F7-6F41218F4564}.Release|x64.Build.0 = Release|x64 1921 {61B23D9B-3F73-4204-98F7-6F41218F4564}.Release|x64.Build.0 = Release|x64
1922 {3142E52C-309A-41D9-BD12-7B7E9E3BDD44}.Debug|Win32.ActiveCfg = Debug|Win32
1923 {3142E52C-309A-41D9-BD12-7B7E9E3BDD44}.Debug|Win32.Build.0 = Debug|Win32
1924 {3142E52C-309A-41D9-BD12-7B7E9E3BDD44}.Debug|x64.ActiveCfg = Debug|x64
1925 {3142E52C-309A-41D9-BD12-7B7E9E3BDD44}.Debug|x64.Build.0 = Debug|x64
1926 {3142E52C-309A-41D9-BD12-7B7E9E3BDD44}.Release|Win32.ActiveCfg = Release|Win32
1927 {3142E52C-309A-41D9-BD12-7B7E9E3BDD44}.Release|Win32.Build.0 = Release|Win32
1928 {3142E52C-309A-41D9-BD12-7B7E9E3BDD44}.Release|x64.ActiveCfg = Release|x64
1929 {3142E52C-309A-41D9-BD12-7B7E9E3BDD44}.Release|x64.Build.0 = Release|x64
1920 EndGlobalSection 1930 EndGlobalSection
1921 GlobalSection(SolutionProperties) = preSolution 1931 GlobalSection(SolutionProperties) = preSolution
1922 HideSolutionNode = FALSE 1932 HideSolutionNode = FALSE