summaryrefslogtreecommitdiffstats
path: root/scilab/Scilab_f2c.sln
diff options
context:
space:
mode:
authorCedric Delamarre <cedric.delamarre@scilab-enterprises.com>2013-07-23 14:45:42 +0200
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>2013-07-23 15:00:08 +0200
commit982522ee413934b4d8646e6fc9bd0c984d6c1154 (patch)
tree2e115d49b2875e439ec1cbcd20ac1c7749cbc02b /scilab/Scilab_f2c.sln
parentc3195ade5f292745378988b4414adeaed0b3afcf (diff)
parent2608ac1e0dcb8d8f15c65c8a057a4cac1cc9b91e (diff)
downloadscilab-982522ee413934b4d8646e6fc9bd0c984d6c1154.zip
scilab-982522ee413934b4d8646e6fc9bd0c984d6c1154.tar.gz
Merge remote-tracking branch 'origin/master' into YaSp
Conflicts: scilab/modules/differential_equations/sci_gateway/fortran/sci_f_bvode.f scilab/modules/differential_equations/src/c/differential_equations.vcxproj scilab/modules/fileio/sci_gateway/c/sci_removedir.c scilab/modules/scicos_blocks/src/c/tows_c.c Change-Id: Ic52b217a9eed4b5315547f60b1a125c186326f49
Diffstat (limited to 'scilab/Scilab_f2c.sln')
-rw-r--r--scilab/Scilab_f2c.sln7
1 files changed, 7 insertions, 0 deletions
diff --git a/scilab/Scilab_f2c.sln b/scilab/Scilab_f2c.sln
index 2f6d66d..abe9371 100644
--- a/scilab/Scilab_f2c.sln
+++ b/scilab/Scilab_f2c.sln
@@ -141,6 +141,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos", "modules\scicos\sr
141 {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} 141 {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
142 {566E524B-D327-4416-A865-9C83503FAB7B} = {566E524B-D327-4416-A865-9C83503FAB7B} 142 {566E524B-D327-4416-A865-9C83503FAB7B} = {566E524B-D327-4416-A865-9C83503FAB7B}
143 {2F7B6080-8D84-43A7-A967-13FC8AA83DEB} = {2F7B6080-8D84-43A7-A967-13FC8AA83DEB} 143 {2F7B6080-8D84-43A7-A967-13FC8AA83DEB} = {2F7B6080-8D84-43A7-A967-13FC8AA83DEB}
144 {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
144 EndProjectSection 145 EndProjectSection
145EndProject 146EndProject
146Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos_f", "modules\scicos\src\fortran\scicos_f2c.vcxproj", "{566E524B-D327-4416-A865-9C83503FAB7B}" 147Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos_f", "modules\scicos\src\fortran\scicos_f2c.vcxproj", "{566E524B-D327-4416-A865-9C83503FAB7B}"
@@ -271,6 +272,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "special_functions_f", "modu
271 EndProjectSection 272 EndProjectSection
272EndProject 273EndProject
273Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "differential_equations", "modules\differential_equations\src\c\differential_equations.vcxproj", "{F0190B5D-FB21-47A2-99AC-06627CDD0F8A}" 274Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "differential_equations", "modules\differential_equations\src\c\differential_equations.vcxproj", "{F0190B5D-FB21-47A2-99AC-06627CDD0F8A}"
275 ProjectSection(ProjectDependencies) = postProject
276 {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
277 EndProjectSection
274EndProject 278EndProject
275Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "differential_equations_f", "modules\differential_equations\src\fortran\differential_equations_f2c.vcxproj", "{28E4E9CA-3EEC-43EE-9F15-56259C6677B8}" 279Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "differential_equations_f", "modules\differential_equations\src\fortran\differential_equations_f2c.vcxproj", "{28E4E9CA-3EEC-43EE-9F15-56259C6677B8}"
276 ProjectSection(ProjectDependencies) = postProject 280 ProjectSection(ProjectDependencies) = postProject
@@ -590,6 +594,9 @@ EndProject
590Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_gw", "modules\core\sci_gateway\cpp\core_gw.vcxproj", "{3E933EB6-D427-4828-9B30-B6B9987491F6}" 594Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_gw", "modules\core\sci_gateway\cpp\core_gw.vcxproj", "{3E933EB6-D427-4828-9B30-B6B9987491F6}"
591EndProject 595EndProject
592Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos-cli", "modules\scicos\src\c\cli\scicos-cli.vcxproj", "{A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}" 596Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos-cli", "modules\scicos\src\c\cli\scicos-cli.vcxproj", "{A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}"
597 ProjectSection(ProjectDependencies) = postProject
598 {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
599 EndProjectSection
593EndProject 600EndProject
594Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos_blocks-cli", "modules\scicos_blocks\src\c\cli\scicos_blocks-cli.vcxproj", "{424A5578-BA28-435F-8313-8D85886A3539}" 601Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos_blocks-cli", "modules\scicos_blocks\src\c\cli\scicos_blocks-cli.vcxproj", "{424A5578-BA28-435F-8313-8D85886A3539}"
595EndProject 602EndProject