From 406ac81fb38df387d9c9432303ad64cd5c003c55 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Thu, 9 Jun 2016 13:26:22 -0600
Subject: [PATCH] Update ChangeLog

---
 ChangeLog.txt                 | 15 +++++++++------
 system/hex2bin/hex2bin_main.c |  8 --------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 9815bd2a7..69a233608 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1620,9 +1620,12 @@
 	  definiitions (2016-06-05).
 	* Many files:  Change to the way that Kconfig files are generated in order
 	  to better support reuse of the apps/ directory in NuttX products.  Changes
-	  include: add kmenu files, make the full tree use wildcards make.defs, Add
-	  empty preconfig rules to 'leaf' makefiles, Use directory.mk for recursive
-	  dir makefiles, Individual app kconfig fixes, Recursive Kconfig
-	  autogeneration, Add kconfig files for pcode and tiff, and fix a gitignore
-	  rule,  From Sébastien Lorquet (2016-06-06).
-
+	  include: Make the full tree use wildcards make.defs, Add empty preconfig
+	  rules to 'leaf' makefiles, Use directory.mk for recursive dir makefiles,
+	  Individual app kconfig fixes, Recursive Kconfig autogeneration, Add
+	  kconfig files for pcode and tiff, and fix a gitignore rule,  From
+	  Sébastien Lorquet (2016-06-06).
+	* apps/nshlib: Make NSH net-initialization be a configuration option. From
+	  Marten Svanfeld (2016-06-09).
+	* netutils/ntpc and nshlib:  NTP Client: All retries; Add initialization
+	  in NSH network startup logic.  From David S. Alessio (2016-06-09) .
diff --git a/system/hex2bin/hex2bin_main.c b/system/hex2bin/hex2bin_main.c
index 6610491e4..762491e27 100644
--- a/system/hex2bin/hex2bin_main.c
+++ b/system/hex2bin/hex2bin_main.c
@@ -49,14 +49,6 @@
 
 #ifdef CONFIG_SYSTEM_HEX2BIN_BUILTIN
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/