From 2bec7f89cc1a4246ef3f0ed18525faef2482419d Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sat, 23 May 2009 23:53:03 +0000
Subject: Resolve merge conflicts

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1821 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'nuttx/ChangeLog')

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 9f0d3d7f5..0c3fbe37b 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -728,6 +728,8 @@
 	* configs/eagle100/nettest: Added an examples/nettest configuration for the
 	  Micromint Eagle100 board.
 	* Documentation/NuttxPortingGuide.html: Added a section on NuttX device drivers.
+	* configs/eagle100/httpd: Added an examples/uip configuration for the
+	  Micromint Eagle100 board.
 	* arch/arm/src/lm3s: Added an SSI driver for the LM3S6918
 	* examples/nsh: Added MMC/SD support for the LM3S6918
 
-- 
cgit v1.2.3