summaryrefslogtreecommitdiffstats
path: root/scilab/Scilab_f2c.sln
diff options
context:
space:
mode:
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>2013-08-14 00:03:07 +0200
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>2013-08-14 10:14:16 +0200
commit5a8d098add4b3e5343f60f06c9166fc02faf1301 (patch)
treea7b23fcf1871070f83bf36c7b34135f17e35f8c0 /scilab/Scilab_f2c.sln
parentb7633c3840605c61f4437df2e3f3ac55a46b1c37 (diff)
parentdff2a126598b77e642be19c5056a2f89bbd21b60 (diff)
downloadscilab-5a8d098add4b3e5343f60f06c9166fc02faf1301.zip
scilab-5a8d098add4b3e5343f60f06c9166fc02faf1301.tar.gz
Merge remote-tracking branch 'origin/master' into yasp
Conflicts: scilab/modules/action_binding/src/jni/InterpreterManagement_wrap.c scilab/modules/commons/src/jni/CommonFileUtils_wrap.c scilab/modules/commons/src/jni/ScilabCommons_wrap.c scilab/modules/completion/src/jni/Completion_wrap.c scilab/modules/console/src/jni/DropFiles_wrap.c scilab/modules/console/src/jni/GuiManagement_wrap.c scilab/modules/core/includes/returnProperty.h scilab/modules/core/src/c/returnProperty.c scilab/modules/double/src/c/double.vcxproj scilab/modules/double/src/fortran/double_f2c.vcxproj scilab/modules/dynamic_link/src/fortran/dynamic_link_f2c.vcxproj scilab/modules/fileio/fileio.vcxproj scilab/modules/functions/src/fortran/functions_f2c.vcxproj scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj scilab/modules/graphic_objects/src/jni/DataLoader_wrap.c scilab/modules/graphic_objects/src/jni/ScilabNativeView_wrap.c scilab/modules/graphics/core_Import.def scilab/modules/graphics/graphics.vcxproj.filters scilab/modules/graphics/sci_gateway/c/sci_matplot.c scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h scilab/modules/graphics/src/c/getHandleProperty/get_data_property.h scilab/modules/gui/src/jni/ScilabTermination_wrap.c scilab/modules/history_manager/src/jni/HistoryManagement_wrap.c scilab/modules/intersci/src/exe/intersciexe/intersciexe.vcxproj scilab/modules/intersci/src/exe/interscin/interscin.vcxproj scilab/modules/intersci/src/lib/intersci.vcxproj scilab/modules/io/src/fortran/io_f2c.vcxproj scilab/modules/javasci/src/jni/call_scilab_wrap.c scilab/modules/localization/src/jni/LocaleToLCID_wrap.c scilab/modules/localization/src/jni/Messages_wrap.c scilab/modules/localization/src/jni/setdefaultlanguage_wrap.c scilab/modules/scinotes/src/jni/ScilabKeywords_wrap.c scilab/modules/string/src/c/string.vcxproj.filters scilab/modules/string/src/fortran/string_f2c.vcxproj scilab/modules/types/src/cpp/ScilabToJava.cpp scilab/modules/types/src/jni/ScilabVariables.giws.xml scilab/modules/types/src/jni/getScilabVariable_wrap.c scilab/modules/types/types.vcxproj scilab/modules/ui_data/src/jni/ui_data_wrap.c scilab/tools/Dumpexts/winDumpExts.c Change-Id: I50ce66384949ac2604788f83f682da094ac6b819
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 abe9371..8f576ed 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}
@@ -1860,4 +1860,7 @@ Global
1860 GlobalSection(SolutionProperties) = preSolution 1860 GlobalSection(SolutionProperties) = preSolution
1861 HideSolutionNode = FALSE 1861 HideSolutionNode = FALSE
1862 EndGlobalSection 1862 EndGlobalSection
1863 GlobalSection(Performance) = preSolution
1864 HasPerformanceSessions = true
1865 EndGlobalSection
1863EndGlobal 1866EndGlobal