summaryrefslogtreecommitdiff
path: root/CHANGES
diff options
context:
space:
mode:
authorforsyth <forsyth@vitanuova.com>2011-05-16 23:28:07 +0100
committerforsyth <forsyth@vitanuova.com>2011-05-16 23:28:07 +0100
commit2b69dba5038ffd0b59cf30a4c44bce549e5097f8 (patch)
tree385d35337b2895a07a2df21bafeb80dd4536e25d /CHANGES
parentd728e3107d7ae935bc511e72efc8a0c43fdbf0a0 (diff)
20110516-2327
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index a2d512ba..7cbe223b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+20110516
+ merge changes from vac branch of mechiel-inferno-os (googlecode)
20110426
emu/Linux/asm-arm.S linux system call interface changed [issue 215, mechiel]
20110419