From 2b69dba5038ffd0b59cf30a4c44bce549e5097f8 Mon Sep 17 00:00:00 2001
From: forsyth <forsyth@vitanuova.com>
Date: Mon, 16 May 2011 23:28:07 +0100
Subject: 20110516-2327

---
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'CHANGES')

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
-- 
cgit v1.2.3