From f0fc621537ea3d31d2f663e898bf4aa19b0f6906 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sat, 23 May 2009 23:53:03 +0000 Subject: [PATCH] Resolve merge conflicts git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1821 42af7a65-404d-4744-a932-0658087f49c3 --- Documentation/NuttX.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html index 8f4d62a083..432ba4e7a5 100644 --- a/Documentation/NuttX.html +++ b/Documentation/NuttX.html @@ -1418,6 +1418,8 @@ nuttx-0.4.7 2009-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> * 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