summaryrefslogtreecommitdiffstats
path: root/scilab/Scilab_f2c.sln
diff options
context:
space:
mode:
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>2013-08-13 20:56:43 +0200
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>2013-08-13 20:57:01 +0200
commitdff2a126598b77e642be19c5056a2f89bbd21b60 (patch)
tree603a76ffeba0b47a53ff363c0b2299401da0ea08 /scilab/Scilab_f2c.sln
parent093b17de41903849cc46d9c4dccafcbd6527bd29 (diff)
parent9b746b3e06f7fd5a66fc42135250dd26c2a9174e (diff)
downloadscilab-dff2a126598b77e642be19c5056a2f89bbd21b60.zip
scilab-dff2a126598b77e642be19c5056a2f89bbd21b60.tar.gz
Merge remote-tracking branch 'origin/vs2012'
Change-Id: I184e3415eeeb4660ac8aea44037ca441ca493b16
Diffstat (limited to 'scilab/Scilab_f2c.sln')
-rw-r--r--scilab/Scilab_f2c.sln7
1 files changed, 5 insertions, 2 deletions
diff --git a/scilab/Scilab_f2c.sln b/scilab/Scilab_f2c.sln
index c99330a..6971cce 100644
--- a/scilab/Scilab_f2c.sln
+++ b/scilab/Scilab_f2c.sln
@@ -1,5 +1,5 @@
1Microsoft Visual Studio Solution File, Format Version 11.00 1Microsoft Visual Studio Solution File, Format Version 12.00
2# Visual Studio 2010 2# Visual Studio 2012
3Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WScilex", "modules\windows_tools\src\c\WScilex\WScilex.vcxproj", "{CCD80549-EB9C-42AA-9B86-D687377E94F6}" 3Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WScilex", "modules\windows_tools\src\c\WScilex\WScilex.vcxproj", "{CCD80549-EB9C-42AA-9B86-D687377E94F6}"
4 ProjectSection(ProjectDependencies) = postProject 4 ProjectSection(ProjectDependencies) = postProject
5 {A9A2020D-5541-44F2-B080-DF3C9426C409} = {A9A2020D-5541-44F2-B080-DF3C9426C409} 5 {A9A2020D-5541-44F2-B080-DF3C9426C409} = {A9A2020D-5541-44F2-B080-DF3C9426C409}
@@ -1592,4 +1592,7 @@ Global
1592 GlobalSection(SolutionProperties) = preSolution 1592 GlobalSection(SolutionProperties) = preSolution
1593 HideSolutionNode = FALSE 1593 HideSolutionNode = FALSE
1594 EndGlobalSection 1594 EndGlobalSection
1595 GlobalSection(Performance) = preSolution
1596 HasPerformanceSessions = true
1597 EndGlobalSection
1595EndGlobal 1598EndGlobal