summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libcpu/i386/ChangeLog
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2007-03-28 18:15:06 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2007-03-28 18:15:06 +0000
commitd7cefbf64b6b0bf331abc0c98f5c7811218082fd (patch)
tree97b1bf602bca1fc54af47ef13204735384547412 /c/src/lib/libcpu/i386/ChangeLog
parent2007-03-28 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-d7cefbf64b6b0bf331abc0c98f5c7811218082fd.tar.bz2
2007-03-28 Joel Sherrill <joel@OARcorp.com>
* page.c: Redo print to not have cvs conflict marker.
Diffstat (limited to '')
-rw-r--r--c/src/lib/libcpu/i386/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/c/src/lib/libcpu/i386/ChangeLog b/c/src/lib/libcpu/i386/ChangeLog
index 556ccf00a5..c027ca87c2 100644
--- a/c/src/lib/libcpu/i386/ChangeLog
+++ b/c/src/lib/libcpu/i386/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-28 Joel Sherrill <joel@OARcorp.com>
+
+ * page.c: Redo print to not have cvs conflict marker.
+
2006-12-02 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: New BUG-REPORT address.