diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-05-23 23:53:03 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-05-23 23:53:03 +0000 |
| commit | 2bec7f89cc1a4246ef3f0ed18525faef2482419d (patch) | |
| tree | d54d7119d4e7a8f3bd38345602b32526a0ffbdfb /nuttx/ChangeLog | |
| parent | 96810b921dd00bb3c235f9eee3b415e05b642f7c (diff) | |
| download | nuttx-2bec7f89cc1a4246ef3f0ed18525faef2482419d.tar.gz nuttx-2bec7f89cc1a4246ef3f0ed18525faef2482419d.tar.bz2 nuttx-2bec7f89cc1a4246ef3f0ed18525faef2482419d.zip | |
Resolve merge conflicts
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1821 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/ChangeLog')
| -rw-r--r-- | nuttx/ChangeLog | 2 |
1 files changed, 2 insertions, 0 deletions
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 |