summaryrefslogtreecommitdiff
path: root/libpthread/linuxthreads/sysdeps/mips
diff options
context:
space:
mode:
Diffstat (limited to 'libpthread/linuxthreads/sysdeps/mips')
-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