Resolve merge conflicts

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1821 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2009-05-23 23:53:03 +00:00
parent 44ecaa8789
commit b8f2e53427
4 changed files with 31 additions and 14 deletions
+10
View File
@@ -61,6 +61,16 @@ Where <sub-directory> is the specific board configuration that you
wish to build. The following board-specific configurations are
available:
dhcpd:
This builds the DCHP server using the examples/dhcpd application
(for execution from FLASH.) See examples/README.txt for information
about ostest.
httpd:
This builds the uIP web server example using the examples/uip application
(for execution from FLASH). See examples/README.txt for information
about ostest.
ostest
This builds the examples/ostest application for execution from FLASH.
See examples/README.txt for information about ostest.