summaryrefslogtreecommitdiffstats
path: root/scilab/Scilab_f2c.sln
diff options
context:
space:
mode:
authorCedric Delamarre <cedric.delamarre@scilab-enterprises.com>2013-09-11 11:05:07 +0200
committerCedric Delamarre <cedric.delamarre@scilab-enterprises.com>2013-09-11 12:00:48 +0200
commit26d917c0290acff6ff39520c2c9acd02f4537001 (patch)
tree6abbd932ac2b5d37dd1b455bc7225b5dd30cf237 /scilab/Scilab_f2c.sln
parente361e0deac382e1bfbad0133e9cdf48834d90166 (diff)
parentf09ac1bd9882456f9480c8bc4a182db06d5471f5 (diff)
downloadscilab-26d917c0290acff6ff39520c2c9acd02f4537001.zip
scilab-26d917c0290acff6ff39520c2c9acd02f4537001.tar.gz
Merge remote-tracking branch 'origin/master' into YaSp
Conflicts: scilab/Makefile.am scilab/Makefile.in scilab/aclocal.m4 scilab/configure scilab/modules/core/includes/returnProperty.h scilab/modules/elementary_functions/sci_gateway/fortran/sci_f_dsearch.f scilab/modules/elementary_functions/src/c/IsEqualVar.c scilab/modules/fileio/tests/unit_tests/mputi.dia.ref scilab/modules/fileio/tests/unit_tests/mputi.tst scilab/modules/integer/src/fortran/i_mput.f scilab/modules/string/Makefile.am scilab/modules/string/Makefile.in scilab/modules/string/sci_gateway/c/sci_strindex.c scilab/modules/string/src/c/string.vcxproj scilab/modules/string/src/c/string.vcxproj.filters scilab/modules/windows_tools/etc/windows_tools.start scilab/tools/innosetup/code_modules.iss Change-Id: I196caae5428a10ea83ce58dcc8cef3d8ba854b2e
Diffstat (limited to 'scilab/Scilab_f2c.sln')
-rw-r--r--scilab/Scilab_f2c.sln3
1 files changed, 0 insertions, 3 deletions
diff --git a/scilab/Scilab_f2c.sln b/scilab/Scilab_f2c.sln
index 8f576ed..ebc8cb3 100644
--- a/scilab/Scilab_f2c.sln
+++ b/scilab/Scilab_f2c.sln
@@ -1860,7 +1860,4 @@ 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
1866EndGlobal 1863EndGlobal