From 6b2b4a367d07c9b895e451111a480bd72c71651f Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Fri, 14 Feb 2003 05:15:15 +0000
Subject: Merger from rtems-4-6-branch.

---
 ChangeLog | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index a9ff49514c..c705081509 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-02-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* aclocal/canonical-target-name.m4: Transform tic4x -> RTEMS_CPU=c4x.
+
+2003-02-11	Joel Sherrill <joel@OARcorp.com>
+
+	* VERSION: Updated to rtems-4.6.0pre1.
+
+2003-02-11	Joel Sherrill <joel@OARcorp.com>
+
+	* aclocal/version.m4: Updated to rtems-4.6.0pre1.
+
 2003-02-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* bootstrap: Remove attempts to detect autoconf and automake using
-- 
cgit v1.2.3