From 7e91845af60d913d4b58f83c0044c8685c3c6ffa Mon Sep 17 00:00:00 2001
From: "\"Steven J. Hill\"" <sjhill@realitydiluted.com>
Date: Fri, 18 Aug 2006 02:53:54 +0000
Subject: Merge from trunk.

---
 libpthread/linuxthreads/sysdeps/pthread/CVS/Entries | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libpthread/linuxthreads/sysdeps/pthread/CVS/Entries')

diff --git a/libpthread/linuxthreads/sysdeps/pthread/CVS/Entries b/libpthread/linuxthreads/sysdeps/pthread/CVS/Entries
index 5bc2def06..0089b7235 100644
--- a/libpthread/linuxthreads/sysdeps/pthread/CVS/Entries
+++ b/libpthread/linuxthreads/sysdeps/pthread/CVS/Entries
@@ -1,5 +1,4 @@
 D/bits////
-/Subdirs/1.1/Tue Nov 15 14:20:47 2005//
 /errno-loc.c/1.4/Tue Nov 15 14:20:47 2005//
 /flockfile.c/1.2/Tue Nov 15 14:20:47 2005//
 /ftrylockfile.c/1.1/Tue Nov 15 14:20:47 2005//
@@ -24,4 +23,5 @@ D/bits////
 /timer_settime.c/1.5/Tue Nov 15 14:20:47 2005//
 /tst-timer.c/1.5/Tue Nov 15 14:20:47 2005//
 /sigaction.c/1.2/Thu Dec 29 06:43:12 2005//
-/Makefile/1.7/Tue Jan 31 05:06:14 2006//
+/Makefile/1.7/Thu Mar  9 20:32:31 2006//
+/Subdirs/1.2/Fri Mar 10 00:41:53 2006//
-- 
cgit v1.2.3