aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphillid <dbphillipsnz@gmail.com>2012-10-01 18:02:33 +1300
committerphillid <dbphillipsnz@gmail.com>2012-10-01 18:02:33 +1300
commit63d3a9efa61e662c81d827eab263f954adc74237 (patch)
tree89eafe394f0a520d0654a1ea1e176357c821550d
parent52c86bd6941b210dfdaba1c7852e6eb49b7899b2 (diff)
parent1366a9481dd96ab431da57a07393e19554a4bd70 (diff)
downloadjaspos-63d3a9efa61e662c81d827eab263f954adc74237.tar.xz
Merge remote-tracking branch 'origin/master'
-rw-r--r--README.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..22c0238
--- /dev/null
+++ b/README.md
@@ -0,0 +1,4 @@
+jaspos
+======
+
+OS written entirely in x86 Assembly \ No newline at end of file