Commit graph

4 commits

Author SHA1 Message Date
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
Charles Betros
1f104d812b Revert "Added some globalization and culture plugs. Also added string and struct tests."
This reverts commit 815f2f78a4.
2016-02-21 10:16:00 -06:00
Charles Betros
815f2f78a4 Added some globalization and culture plugs. Also added string and struct tests. 2016-02-21 10:13:29 -06:00
Matthijs ter Woord
8e35d79602 Reading almost fixed. 2015-10-02 19:39:56 +02:00