summaryrefslogtreecommitdiff
path: root/libpthread/linuxthreads/sysdeps/mips/CVS/Entries
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-03-10 00:39:38 +0000
committerMike Frysinger <vapier@gentoo.org>2006-03-10 00:39:38 +0000
commit1ff4c6408c19488f30063ec086732f6f0e6db3b7 (patch)
treee5c64d1f12c38001bc97fa2b07ae47ff5df9a148 /libpthread/linuxthreads/sysdeps/mips/CVS/Entries
parenta219c7ddc96c93e2abe2aeebc064253f94d58000 (diff)
sync with glibc CVS
Diffstat (limited to 'libpthread/linuxthreads/sysdeps/mips/CVS/Entries')
-rw-r--r--libpthread/linuxthreads/sysdeps/mips/CVS/Entries2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpthread/linuxthreads/sysdeps/mips/CVS/Entries b/libpthread/linuxthreads/sysdeps/mips/CVS/Entries
index c72c96d32..fc279d87c 100644
--- a/libpthread/linuxthreads/sysdeps/mips/CVS/Entries
+++ b/libpthread/linuxthreads/sysdeps/mips/CVS/Entries
@@ -1,4 +1,4 @@
/pspinlock.c/1.15/Tue Nov 15 14:20:47 2005//
/pt-machine.h/1.18/Tue Nov 15 14:20:47 2005//
-/tls.h/1.1/Tue Nov 15 14:20:47 2005//
+/tls.h/1.2/Result of merge//
D