Commit graph

6140 commits

Author SHA1 Message Date
Matthijs ter Woord
9f3199ac37 Merge pull request #380 from CaveSponge/master
Change the install-vs2015 to check whether build machine is 32-bit or 64-bit
2016-06-16 17:47:41 +02:00
Matthijs ter Woord
195835cb44 Merge branch 'master' of https://github.com/CosmosOS/Cosmos 2016-06-16 11:41:30 -04:00
Matthijs ter Woord
f1f5e88c3d . 2016-06-16 11:41:19 -04:00
CaveSponge
39aec8a1e0 Merge remote-tracking branch 'refs/remotes/CosmosOS/master' 2016-06-16 14:51:50 +01:00
MichaelTheShifter
ab160842e1 Merge remote-tracking branch 'refs/remotes/CosmosOS/master' 2016-06-16 08:22:50 -04:00
MichaelTheShifter
b795d787f8 fixed an error with the cctor plug in system.security.cryptography.cryptoconfig 2016-06-16 08:22:29 -04:00
Charles Betros
af12bec66f More filesystem work. 2016-06-15 23:29:36 -05:00
Charles Betros
77d0c37b3b Filesystem work 2016-06-15 20:53:29 -05:00
MichaelTheShifter
dedc7b26a6 Merge remote-tracking branch 'refs/remotes/CosmosOS/master' into crypto 2016-06-15 20:13:11 -04:00
Matthijs ter Woord
550901b19a . 2016-06-15 18:10:54 -04:00
Matthijs ter Woord
594efd2fd7 . 2016-06-15 16:50:40 -04:00
Matthijs ter Woord
2ce5c4cb1f . 2016-06-15 16:47:21 -04:00
Matthijs ter Woord
fc902e5a68 . 2016-06-15 16:38:45 -04:00
Matthijs ter Woord
98cd7da12f . 2016-06-15 16:31:21 -04:00
Matthijs ter Woord
2af1f70dbe Merge branch 'master' of https://github.com/CosmosOS/Cosmos 2016-06-15 16:28:40 -04:00
Matthijs ter Woord
6b5373da23 . 2016-06-15 15:16:52 -04:00
Kudzu
d5c3dff966 Heap works 2016-06-15 15:12:48 -04:00
Matthijs ter Woord
dd55bff2c1 . 2016-06-15 15:11:55 -04:00
Matthijs ter Woord
5979ad032e . 2016-06-15 15:04:50 -04:00
Matthijs ter Woord
12d1ae5614 . 2016-06-15 12:50:06 -04:00
Matthijs ter Woord
5803a95381 . 2016-06-15 12:36:58 -04:00
Matthijs ter Woord
f86cbfb6bf . 2016-06-15 12:35:46 -04:00
Matthijs ter Woord
ff5662e9aa . 2016-06-15 12:22:55 -04:00
Matthijs ter Woord
1dc41f1a4b . 2016-06-15 12:16:27 -04:00
Matthijs ter Woord
f6f0bab95b . 2016-06-15 12:03:44 -04:00
Matthijs ter Woord
feef7db59a . 2016-06-15 11:45:30 -04:00
MichaelTheShifter
359c4569bf Merge remote-tracking branch 'refs/remotes/CosmosOS/master' 2016-06-15 10:05:21 -04:00
MichaelTheShifter
356f69f491 Added ZMachine demo stuff to cosmos sln 2016-06-15 10:04:46 -04:00
MichaelTheShifter
e38f8820b3 Merge remote-tracking branch 'refs/remotes/CosmosOS/master' 2016-06-15 10:00:48 -04:00
MichaelTheShifter
f27cdb0868 Merge remote-tracking branch 'refs/remotes/CosmosOS/master' into crypto 2016-06-15 10:00:32 -04:00
Matthijs ter Woord
bbb8265166 . 2016-06-15 09:55:11 -04:00
Matthijs ter Woord
452cad9483 Merge branch 'master' of https://github.com/CosmosOS/Cosmos 2016-06-15 08:39:39 -04:00
Matthijs ter Woord
f5e3ea6da9 . 2016-06-15 08:39:19 -04:00
MichaelTheShifter
07c5a1a4bf Merge remote-tracking branch 'refs/remotes/CosmosOS/master' into crypto 2016-06-15 08:16:10 -04:00
Charles Betros
257b9cff36 Change all unit tests to x86. 2016-06-14 23:43:02 -05:00
Charles Betros
940ad74c36 Unit tests need to run as x86 2016-06-14 23:23:36 -05:00
Charles Betros
f74054399c Merge branch 'master' of https://github.com/CosmosOS/Cosmos.git 2016-06-14 23:20:18 -05:00
Charles Betros
280fdead4c Fix filesystem. 2016-06-14 23:20:10 -05:00
Matthijs ter Woord
456772f88f . 2016-06-14 21:25:40 -04:00
Kudzu
95c0021bf0 Heap 2016-06-14 21:21:37 -04:00
Kudzu
a4b05c8eb1 Merge branch 'master' of https://github.com/CosmosOS/Cosmos 2016-06-14 21:13:03 -04:00
Kudzu
639b5c2b21 heap 2016-06-14 21:12:52 -04:00
Matthijs ter Woord
9a2f6714b5 . 2016-06-14 20:58:19 -04:00
Matthijs ter Woord
ee36382c27 . 2016-06-14 20:39:18 -04:00
Matthijs ter Woord
336020b418 . 2016-06-14 20:36:14 -04:00
Matthijs ter Woord
7021a657af Merge branch 'master' of https://github.com/CosmosOS/Cosmos 2016-06-14 17:53:20 -04:00
Matthijs ter Woord
1b42377138 . 2016-06-14 17:53:14 -04:00
Matthijs ter Woord
d5dc2328b0 More refactoring. 2016-06-14 16:46:11 -04:00
Charles Betros
24d9000fa9 Merge branch 'master' of https://github.com/CosmosOS/Cosmos.git 2016-06-14 15:28:00 -05:00
Charles Betros
98de92b04e Fix char[] in the debugger. 2016-06-14 15:27:46 -05:00