summaryrefslogtreecommitdiffstats
path: root/scilab/Scilab_f2c.sln
diff options
context:
space:
mode:
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>2014-10-08 16:29:20 +0200
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>2014-10-08 16:29:20 +0200
commit40ce1e9a4bc7d97dd6cd206d78bbeb43f76508e1 (patch)
tree8b91f4fac9e824f7f976d46bbd1113b3c4879b22 /scilab/Scilab_f2c.sln
parent04c574d9ca8827e95f8f5a22ea05a9cfde3a5d17 (diff)
parent9994de2b7a86d2be21c165a4e6f87fb9b80d9140 (diff)
downloadscilab-40ce1e9a4bc7d97dd6cd206d78bbeb43f76508e1.zip
scilab-40ce1e9a4bc7d97dd6cd206d78bbeb43f76508e1.tar.gz
Merge remote-tracking branch 'origin/master' into YaSp
Conflicts: scilab/modules/helptools/src/BuildChm/BuildChm.vcxproj Change-Id: I2cbc29c80eeeda2c654bf59842fe6510dfd32752
Diffstat (limited to 'scilab/Scilab_f2c.sln')
-rw-r--r--scilab/Scilab_f2c.sln2
1 files changed, 0 insertions, 2 deletions
diff --git a/scilab/Scilab_f2c.sln b/scilab/Scilab_f2c.sln
index 64b33f0..ab4ea53 100644
--- a/scilab/Scilab_f2c.sln
+++ b/scilab/Scilab_f2c.sln
@@ -192,8 +192,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tclsci", "modules\tclsci\tc
192EndProject 192EndProject
193Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Javasci", "modules\javasci\Javasci.vcxproj", "{0BD503EF-5CB6-4277-BAC4-8955C97F247D}" 193Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Javasci", "modules\javasci\Javasci.vcxproj", "{0BD503EF-5CB6-4277-BAC4-8955C97F247D}"
194EndProject 194EndProject
195Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuildChm", "modules\helptools\src\BuildChm\BuildChm.vcxproj", "{D319F719-F429-4842-A6F9-B1227FE2A54D}"
196EndProject
197Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "time", "modules\time\time.vcxproj", "{05D8F60B-332A-4161-B946-B8AB30ED439C}" 195Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "time", "modules\time\time.vcxproj", "{05D8F60B-332A-4161-B946-B8AB30ED439C}"
198EndProject 196EndProject
199Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sound", "modules\sound\sound.vcxproj", "{03773159-155A-48E0-9B26-119D0BF35B2B}" 197Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sound", "modules\sound\sound.vcxproj", "{03773159-155A-48E0-9B26-119D0BF35B2B}"