summaryrefslogtreecommitdiffstats
path: root/cpukit/ChangeLog
diff options
context:
space:
mode:
authorJennifer Averett <Jennifer.Averett@OARcorp.com>2005-05-17 14:53:01 +0000
committerJennifer Averett <Jennifer.Averett@OARcorp.com>2005-05-17 14:53:01 +0000
commit6d03c944639297dc964cbd06180702a6934a45bc (patch)
tree04b736ce2bed7ff11b44957efbd1c930ad90f30e /cpukit/ChangeLog
parent2005-05-17 Jennifer Averett <jennifer.averett@oarcorp.com> (diff)
downloadrtems-6d03c944639297dc964cbd06180702a6934a45bc.tar.bz2
2005-05-17 Jennifer Averett <jennifer.averett@oarcorp.com>
* Makefile.am, preinstall.am: Added a common irq.h * include/rtems/irq.h: New file.
Diffstat (limited to 'cpukit/ChangeLog')
-rw-r--r--cpukit/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 3bc950c2e0..e95e633f16 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -34,7 +34,6 @@
* libnetworking/net/rtsock.c: Abandon AF_NS.
* libnetworking/sys/socket.h: Abandon AF_NS, PF_NS.
->>>>>>> 1.520
2005-05-10 Ralf Corsepius <ralf.corsepius@rtems.org>
* httpd/socket.c: socklen_t.