From 5753862bf042ecccb4f4ff3a6bd36a001920f225 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sun, 28 Dec 2014 17:12:36 -0600
Subject: [PATCH] Update ChangeLog

---
 ChangeLog.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index b0349c527..c082d250a 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1158,4 +1158,6 @@
 	  text based serial communications attached to their Nuttx systems. From
 	  Harald Welte (2014-12-13).
 	* apps/examples/ltdc and build-related file: Add ltdc test example. From
-	  Marco Krahl (2014-14-19).
+	  Marco Krahl (2014-12-19).
+	* apps/system/cdcacm and usbmsc:  Fix some strangely placed conditional
+	  compilation.  Looks like an automated update gone awry (2014-12-28).