forked from CosmosOS/Cosmos
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/CosmosOS/Cosmos into mkis…
…ofs-merged Conflicts: .gitignore
- Loading branch information
Showing
425 changed files
with
3,477 additions
and
2,858 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<configuration> | ||
<startup> | ||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client" /> | ||
</startup> | ||
<runtime> | ||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
<!-- The redirects allow using AddIns with a different ILSpy version than they were compiled against. --> | ||
<!-- No guarantee they'll work correctly, though (there might be breaking API changes in ILSpy). --> | ||
<dependentAssembly> | ||
<assemblyIdentity name="ICSharpCode.TreeView" publicKeyToken="d4bfe873e7598c49" culture="neutral"/> | ||
<bindingRedirect oldVersion="4.1.0.0-99.9.9.9" newVersion="4.2.0.8752"/> | ||
</dependentAssembly> | ||
<dependentAssembly> | ||
<assemblyIdentity name="ICSharpCode.AvalonEdit" publicKeyToken="9cc39be672370310" culture="neutral"/> | ||
<bindingRedirect oldVersion="4.1.0.0-99.9.9.9" newVersion="4.2.0.8752"/> | ||
</dependentAssembly> | ||
<dependentAssembly> | ||
<assemblyIdentity name="ICSharpCode.NRefactory" publicKeyToken="d4bfe873e7598c49" culture="neutral"/> | ||
<bindingRedirect oldVersion="5.0.0.0-99.9.9.9" newVersion="5.0.0.0"/> | ||
</dependentAssembly> | ||
<dependentAssembly> | ||
<assemblyIdentity name="ICSharpCode.NRefactory.CSharp" publicKeyToken="d4bfe873e7598c49" culture="neutral"/> | ||
<bindingRedirect oldVersion="5.0.0.0-99.9.9.9" newVersion="5.0.0.0"/> | ||
</dependentAssembly> | ||
<dependentAssembly> | ||
<assemblyIdentity name="ICSharpCode.NRefactory.VB" publicKeyToken="d4bfe873e7598c49" culture="neutral"/> | ||
<bindingRedirect oldVersion="5.0.0.0-99.9.9.9" newVersion="5.0.0.0"/> | ||
</dependentAssembly> | ||
<dependentAssembly> | ||
<assemblyIdentity name="ICSharpCode.Decompiler" publicKeyToken="d4bfe873e7598c49" culture="neutral"/> | ||
<bindingRedirect oldVersion="1.0.0.0-99.9.9.9" newVersion="2.2.0.1706"/> | ||
</dependentAssembly> | ||
<dependentAssembly> | ||
<assemblyIdentity name="ILSpy" publicKeyToken="d4bfe873e7598c49" culture="neutral"/> | ||
<bindingRedirect oldVersion="1.0.0.0-99.9.9.9" newVersion="2.2.0.1706"/> | ||
</dependentAssembly> | ||
<dependentAssembly> | ||
<assemblyIdentity name="Mono.Cecil" publicKeyToken="0738eb9f132ed756" culture="neutral"/> | ||
<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="0.9.5.0"/> | ||
</dependentAssembly> | ||
<dependentAssembly> | ||
<assemblyIdentity name="Mono.Cecil.Pdb" publicKeyToken="0738eb9f132ed756" culture="neutral"/> | ||
<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="0.9.5.0"/> | ||
</dependentAssembly> | ||
</assemblyBinding> | ||
</runtime> | ||
</configuration> |
Binary file not shown.
Binary file not shown.
1 change: 0 additions & 1 deletion
1
Resources/Dependencies/Mosa/..svnbridge/Mosa.Utility.IsoImage.dll
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 0 additions & 10 deletions
10
Users/Clearosdev/StandAloneDebug/StandAloneDebug/StandAloneDebug.csproj.vspscc
This file was deleted.
Oops, something went wrong.
10 changes: 0 additions & 10 deletions
10
Users/EdNutting/EdNuttingsTest/EdNuttingsTest.csproj.vspscc
This file was deleted.
Oops, something went wrong.
10 changes: 0 additions & 10 deletions
10
Users/EdNutting/EdNuttingsTest/EdNuttingsTestBoot.Cosmos.vspscc
This file was deleted.
Oops, something went wrong.
10 changes: 0 additions & 10 deletions
10
Users/Geramy/GeramyLovelessTest/GeramyLovelessTest.csproj.vspscc
This file was deleted.
Oops, something went wrong.
10 changes: 0 additions & 10 deletions
10
Users/Geramy/GeramyLovelessTest/GeramyLovelessTestBoot.Cosmos.vspscc
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.