From 3f010b19054543534a970fc645ee984948c7b13e Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 28 Nov 2014 15:41:47 -0600
Subject: [PATCH] Update ChangeLogs

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

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 234dc7581..83112ff82 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1144,3 +1144,5 @@
 
 	* apps/examples/romfs/Makefile: fix romfs example builtin app registry
 	  issue.  From Librae (2014-11-27).
+	* apps/examples/djoystick and support file:  Add a test of the discrete
+	  joystick driver (2014-11-28).