summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bf6fe2456d..17dee0c8d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2011-03-04 Ralf Corsépius <ralf.corsepius@rtems.org>
+ * Makefile.am: Merge-in make/Makefile.am.
+ * configure.ac: Reflect change above.
+
+2011-03-04 Ralf Corsépius <ralf.corsepius@rtems.org>
+
* Makefile.maint, aclocal/rpm.m4, aclocal/rtems-top.m4,
aclocal/version.m4: Rename RTEMS_API into _RTEMS_API.