summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--make/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/make/ChangeLog b/make/ChangeLog
index c4cc594a04..c06adbb063 100644
--- a/make/ChangeLog
+++ b/make/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-09 Ralf Corsepius <ralf.corsepius@rtems.org>
+
+ * custom/leon1.cfg, custom/leon2.cfg, custom/leon3.cfg, sis.cfg:
+ Merger from rtems-4-6-branch.
+
2006-01-01 Ralf Corsepius <ralf.corsepius@rtems.org>
PR 851/bsps