summaryrefslogtreecommitdiff
path: root/CHANGES
diff options
context:
space:
mode:
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