From f0ed832ea9673ffa4bab249494c9918bdc6c2d81 Mon Sep 17 00:00:00 2001
From: James Cotton <peabody124@gmail.com>
Date: Mon, 4 Jun 2012 13:12:12 -0500
Subject: [PATCH] Updated history

---
 HISTORY.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/HISTORY.txt b/HISTORY.txt
index b2cfe1b92..4d22602df 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -1,5 +1,12 @@
 Short summary of changes.  For a complete list see the git log.
 
+2012-06-04
+AeroSimRC support merged into next
+
+2012-05-26
+VirtualFlybar which allows a more aggressive flight mode than rate mode
+support.  Also PiroCompensation added.
+
 2012-05-26
 Revert some UI changes that didn't work consistently between OSX and Windows.