From bd6f22738c2b2a3985f6f5c6fb89fe66b00f0c8a Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 7 Nov 2014 16:25:47 -0600
Subject: [PATCH] Update ChangeLog

---
 ChangeLog.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index df7295df2..f8e09bc2c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1097,3 +1097,9 @@
 	  Pierre-Noel Bouteville (2014-10-23).
 	* apps/nshlib/nsh_parse.c, nsh.h, and Kconfig: Move CONFIG_NSH_TMPDIR
 	  to CONFIG_LIBC_TMPDIR (2014-11-05).
+	* apps/interpreter/bas:  Merged in the Michael Haardt's BAS 2.4 adapted
+	  for use by NuttX by Alan Carvalho de Assis.  The bas24 branch was merged
+	  into the master branch on this date (2014-11-7).
+	* apps/examples/bastest:  This is a special version of Michael
+	  Haardt's BAS 2.4 test files adapted for use by NuttX on a ROMFS file
+	  system (2014-11-7).