dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-05-26 21:42:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5965 commits 58 branches 10 tags 192 MiB
Commit graph

21 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
4a3b6a50df Fixed up project and solution configurations and remove jetbrains annotations. 2016-03-06 17:33:21 -06:00
fanoI
37b259fc90 Nothing to do? Wrong code continues to exists? 2016-02-28 16:47:31 +01:00
fanoI
3000650210 Tried for the last time to ri-pristinate the correct GuessOS.cs without Console debug code... what is that re-merge the wrong version? 2016-02-28 16:43:39 +01:00
fanoI
b0facaedad Tried for the last time to ri-pristinate the correct GuessOS.cs without Console debug code... what is that re-merge the wrong version? 2016-02-28 16:37:02 +01:00
fanoI
093e6777b4 Revert "Restored Files that should not be changed" 
This reverts commit 4606bc84c7.
 2016-01-15 00:18:52 +01:00
fanoI
102b5357ef Revert "The Original property file should be restored" 
This reverts commit ab504a8478.
 2016-01-15 00:18:47 +01:00
fanoI
b803343748 Revert "Last try to not have conflicts..." 
This reverts commit 97a11e6331.
 2016-01-15 00:18:24 +01:00
fanoI
97a11e6331 Last try to not have conflicts... 2016-01-14 21:12:36 +01:00
fanoI
ab504a8478 The Original property file should be restored 2016-01-14 21:10:00 +01:00
fanoI
4606bc84c7 Restored Files that should not be changed 2016-01-14 20:58:26 +01:00
fanoI
ee11522200 Merged master fixed conflict. 2016-01-14 20:49:49 +01:00
Matthijs ter Woord
42ec16044c Cleanup Guess demo project. 2015-07-22 15:57:01 +02:00
Matthijs ter Woord
8e7fc28e0e Ongoing debug fixes. 2015-07-21 14:51:31 +02:00
Matthijs ter Woord
8e2a89ac6e Restore guess demo. 2015-07-05 14:07:51 +02:00
Matthijs ter Woord
732a3e2a3a More fixes to stack reservation. We were assuming that there was space reserved for return value, while it shouldn't in all cases. 2015-07-04 12:46:28 +02:00
Matthijs ter Woord
5c116490da Cleanup. 2015-06-17 20:22:58 +02:00
Matthijs ter Woord
68282aa557 Keyboard works. Next is enabling code that should be enabled, and removing debug code. 2015-06-17 20:09:37 +02:00
Matthijs ter Woord
44cdc7dc61 Other fixes. 2015-06-16 18:35:46 +02:00
Matthijs ter Woord
14856e4afc muxing works now. 2014-12-31 12:36:51 +01:00
kudzu_cp
36aaf46919 2014-07-14 15:54:43 +00:00
Renamed from source2/Demos/Guess/GuessOS.cs (Browse further)