diff options
author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-08-18 02:49:28 +0000 |
---|---|---|
committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-08-18 02:49:28 +0000 |
commit | 5f7339fd738083baf7e42268301babd4324c3e3e (patch) | |
tree | 092a1ceb6ff0b6e83808b53fed77a4cd64609ba1 /libpthread/linuxthreads/sysdeps/unix/sysv/linux/CVS | |
parent | 1191db0686f450f1e9988fc04621489ba7e0a907 (diff) | |
download | uClibc-alpine-5f7339fd738083baf7e42268301babd4324c3e3e.tar.bz2 uClibc-alpine-5f7339fd738083baf7e42268301babd4324c3e3e.tar.xz |
Merge from trunk.
Diffstat (limited to 'libpthread/linuxthreads/sysdeps/unix/sysv/linux/CVS')
-rw-r--r-- | libpthread/linuxthreads/sysdeps/unix/sysv/linux/CVS/Entries | 6 | ||||
-rw-r--r-- | libpthread/linuxthreads/sysdeps/unix/sysv/linux/CVS/Repository | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/CVS/Entries b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/CVS/Entries index 11642f1d6..00c1a4b80 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/CVS/Entries +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/CVS/Entries @@ -23,6 +23,6 @@ D/x86_64//// /allocrtsig.c/1.2/Wed Nov 30 19:58:15 2005// /mq_notify.c/1.4/Thu Dec 29 06:43:12 2005// /pt-sigsuspend.c/1.2/Result of merge// -/Makefile/1.1/Tue Jan 31 05:06:14 2006// -/Implies/1.1/Thu Feb 2 15:33:07 2006// -/Versions/1.1/Thu Feb 2 15:33:07 2006// +/Implies/1.1/Thu Mar 9 20:32:31 2006// +/Makefile/1.1/Thu Mar 9 20:32:31 2006// +/Versions/1.1/Thu Mar 9 20:32:31 2006// diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/CVS/Repository b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/CVS/Repository index c299f47ca..69c8f332a 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/CVS/Repository +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/CVS/Repository @@ -1 +1 @@ -ports/linuxthreads/sysdeps/unix/sysv/linux +linuxthreads/linuxthreads/sysdeps/unix/sysv/linux |