summaryrefslogtreecommitdiffstats
path: root/scilab/Scilab_f2c.sln
diff options
context:
space:
mode:
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>2012-08-14 09:57:35 +0200
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>2012-08-14 11:31:15 +0200
commitb4ab6cfc0aa1fdef72a9cbaa136daa5a7984215f (patch)
tree75b6b64d1eb72ff5a3c346f5a3bd4ec73eb3cc75 /scilab/Scilab_f2c.sln
parent13646f0787dd466364c1612b4087c356bd3b6210 (diff)
parentaeed818c5c7387f63b4bd70d68d398e637778c84 (diff)
downloadscilab-b4ab6cfc0aa1fdef72a9cbaa136daa5a7984215f.zip
scilab-b4ab6cfc0aa1fdef72a9cbaa136daa5a7984215f.tar.gz
Merge remote-tracking branch 'origin/master' into YaSp
Conflicts: scilab/Scilab.sln scilab/Scilab_f2c.sln scilab/configure scilab/modules/Makefile.in scilab/modules/core/includes/machine.h.in scilab/modules/double/Makefile.in scilab/modules/hdf5/Makefile.am scilab/modules/hdf5/Makefile.in scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp scilab/modules/hdf5/src/c/hdf5.vcxproj scilab/modules/hdf5/src/c/hdf5.vcxproj.filters scilab/modules/hdf5/src/cpp/forceJHDF5load.cpp scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabInteger.java scilab/modules/hdf5/src/jni/jhdf5load.hxx scilab/modules/intersci/Makefile.in scilab/modules/intersci/help/en_US/intersci.xml scilab/modules/io/sci_gateway/c/sci_save.c scilab/modules/modules_manager/help/en_US/tbx_build_loader.xml scilab/modules/types/Makefile.in scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp Change-Id: I47b159cfa8f15e9f1594a3de2693aaf9c75ed7e0
Diffstat (limited to 'scilab/Scilab_f2c.sln')
-rw-r--r--scilab/Scilab_f2c.sln4
1 files changed, 4 insertions, 0 deletions
diff --git a/scilab/Scilab_f2c.sln b/scilab/Scilab_f2c.sln
index 668551c..b11d054 100644
--- a/scilab/Scilab_f2c.sln
+++ b/scilab/Scilab_f2c.sln
@@ -547,6 +547,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "time_gw", "modules\time\sci
547 {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D} 547 {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D}
548 EndProjectSection 548 EndProjectSection
549EndProject 549EndProject
550Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graph-JAVA-tests", "modules\graph\tests\java\graph-JAVA-tests.vcxproj", "{AB7EBA0D-1B00-4B1B-BB00-62AB38E2309A}"
551EndProject
552Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos-JAVA-tests", "modules\xcos\tests\java\xcos-JAVA-tests.vcxproj", "{DABDF840-2A2F-4B38-90B2-A4393E6DF38B}"
553EndProject
550Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "string_gw", "modules\string\sci_gateway\cpp\string_gw.vcxproj", "{AEC1F7B5-28F2-4C1F-A436-98D0352FD3F5}" 554Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "string_gw", "modules\string\sci_gateway\cpp\string_gw.vcxproj", "{AEC1F7B5-28F2-4C1F-A436-98D0352FD3F5}"
551 ProjectSection(ProjectDependencies) = postProject 555 ProjectSection(ProjectDependencies) = postProject
552 {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D} 556 {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D}