forked fromdotnet/fsharp
- Notifications
You must be signed in to change notification settings - Fork0
Commit6a0c3f1
committed
Merge branch 'master' into fsharp4
Conflicts:tests/BuildTestTools.cmdtests/fsharp/tools/FSharp.PowerPack/fsppack/src/CodePlex.Settings.targetstests/fsharp/tools/FSharp.PowerPack/fsppack/src/CodePlex.targetstests/fsharp/tools/FSharp.PowerPack/fsppack/src/FSharp.Compiler.CodeDom/Test.Compiler.CodeDom.fsprojtests/fsharp/tools/FSharp.PowerPack/fsppack/src/FSharp.PowerPack.Linq/Test.PowerPack.Linq.fsprojtests/fsharp/tools/FSharp.PowerPack/fsppack/src/FSharp.PowerPack/Test.PowerPack.fsprojFile tree
385 files changed
+249
-212259
lines changed- lkg
- FSharp-2.0.50726.900
- bin
- chk_bin
- FSharp-4.0.30319.1/bin
- FSharp.Core
- src
- absil
- fsharp
- FSharp.Core
- ilx
- tests
- fsharpqa
- Source/CompilerOptions/fsc/warnon
- testenv
- bin
- amd64
- ia64
- x86
- src/diff
- fsharp
- core
- libtest
- printing
- regression/ml-1
- tools/FSharp.PowerPack
- fixed
- fsppack/src
- FSharp.Compiler.CodeDom
- FSharp.PowerPack.Linq
- FSharp.PowerPack
- math
- lapack
- vsintegration/src
- unittests
- vs/FsPkgs/FSharp.Project
- Common.Source.CSharp/Project
- Automation
- VSProject
- VB/FSharpPropPage/Resources
- ApplicationDesigner
- Common
- Native
- ResourceEditor
- WCF
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
385 files changed
+249
-212259
lines changedBinary file not shown.
Binary file not shown.
This file was deleted.
Binary file not shown.
Binary file not shown.
0 commit comments
Comments
(0)