2009-08-06 Joel Sherrill <joel.sherrill@oarcorp.com>

	* ChangeLog, Makefile: Merge programs from examples.

2 files changed, 18 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index e69de29..5a9353b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,11 @@
+2009-08-06	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* ChangeLog, Makefile: Merge programs from examples.
+
+2009-08-06	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile: Merge programs from examples.
+	* posix_api/ChangeLog, posix_api/Makefile,
+	posix_api/psx_sched_report/Makefile,
+	posix_api/psx_sched_report/README, posix_api/psx_sched_report/test.c: New files.
+
diff --git a/Makefile b/Makefile
index 058647b..0ed5e28 100644
--- a/Makefile
+++ b/Makefile
@@ -6,4 +6,10 @@ include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
 include $(RTEMS_CUSTOM)
 include $(RTEMS_ROOT)/make/directory.cfg
 
-SUBDIRS=classic_api hello led misc ticker
+SUBDIRS=classic_api posix_api hello led misc ticker file_io
+
+# Monitor Specific Examples
+SUBDIR += uboot
+
+# Language Specific Examples
+SUBDIR += cxx