fanoI 35583c657a Merge branch 'master' of https://github.com/CosmosOS/Cosmos ... # Conflicts: # Demos/Guess/GuessOS.cs # Tests/Cosmos.Compiler.Tests.Bcl/Kernel.cs # source/Cosmos.System.Plugs/Cosmos.System.Plugs.csproj		2016-03-07 21:23:11 +01:00
..
Properties		2014-07-14 15:54:43 +00:00
Compile last with NASM.bat		2014-07-14 15:54:43 +00:00
Cosmos.bxrc		2014-07-14 15:54:43 +00:00
Guess.Cosmos	Revert "Last try to not have conflicts..."	2016-01-15 00:18:24 +01:00
GuessKernel.csproj	Fixed up project and solution configurations and remove jetbrains annotations.	2016-03-06 17:33:21 -06:00
GuessOS.cs	Merge branch 'master' of https://github.com/CosmosOS/Cosmos	2016-03-07 21:23:11 +01:00