summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-12-28 19:03:32 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-12-28 19:03:32 -0600
commit69f8f1abc09249ebcb34ce8f092d0c2ad3ea92dc (patch)
tree11ff2a515bdb846bbf147dc2bc1c4dd3ef4c04f2 /apps
parent5eb00d56107de10e5bbba7a7fd2fc8001d6e9ae8 (diff)
downloadnuttx-69f8f1abc09249ebcb34ce8f092d0c2ad3ea92dc.tar.gz
nuttx-69f8f1abc09249ebcb34ce8f092d0c2ad3ea92dc.tar.bz2
nuttx-69f8f1abc09249ebcb34ce8f092d0c2ad3ea92dc.zip
Update changelog
Diffstat (limited to 'apps')
-rw-r--r--apps/ChangeLog.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index c082d250a..0937bd745 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -1159,5 +1159,6 @@
Harald Welte (2014-12-13).
* apps/examples/ltdc and build-related file: Add ltdc test example. From
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).
+ * apps/system/cdcacm, composite and usbmsc: Fix some strangely placed
+ conditional compilation. Looks like an automated update gone awry
+ (2014-12-28).