summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2009-08-06 23:23:35 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2009-08-06 23:23:35 +0000
commit3a5391e6230f5e77c0f2e2b9ebef66d8806c0e44 (patch)
tree5eb3072e9d66d3236f4e61c54d191d1155d15745
parent9a0cbfdd9e2af19870a9c80872c0134623cfcbca (diff)
2009-08-06 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile: Fix typo.
-rw-r--r--ChangeLog4
-rw-r--r--Makefile4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a9353b..b27207b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2009-08-06 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * Makefile: Fix typo.
+
+2009-08-06 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* ChangeLog, Makefile: Merge programs from examples.
2009-08-06 Joel Sherrill <joel.sherrill@oarcorp.com>
diff --git a/Makefile b/Makefile
index 0ed5e28..996ce15 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ include $(RTEMS_ROOT)/make/directory.cfg
SUBDIRS=classic_api posix_api hello led misc ticker file_io
# Monitor Specific Examples
-SUBDIR += uboot
+SUBDIRS += uboot
# Language Specific Examples
-SUBDIR += cxx
+SUBDIRS += cxx