diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-05-16 14:59:34 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-05-16 14:59:34 +0000 |
commit | 5b818e69bce954be61aeebb12d111006ce13c0eb (patch) | |
tree | 1fe9948601dc7a6f840fdda516d4a0a3eabed428 /libc/resolv | |
parent | 56582813a2a1bb763cad0cfa761f5df76c707cb3 (diff) |
Merge changes between r8452 and r8459 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@8460 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/resolv')
-rw-r--r-- | libc/resolv/.cvsignore | 6 | ||||
-rw-r--r-- | libc/resolv/ns_date.c | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/libc/resolv/.cvsignore b/libc/resolv/.cvsignore deleted file mode 100644 index 3fc9f4cdf..000000000 --- a/libc/resolv/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -*.d *.o *.so *.po *.go stamp.* *.stamp *.ustamp *.udeps -*.gz *.Z *.tar *.tgz -=* -TODO COPYING* AUTHORS copyr-* copying.* -glibc-* -distinfo diff --git a/libc/resolv/ns_date.c b/libc/resolv/ns_date.c index 3fee9b7b5..9801ac46d 100644 --- a/libc/resolv/ns_date.c +++ b/libc/resolv/ns_date.c @@ -16,7 +16,7 @@ */ #if !defined(_LIBC) && !defined(lint) -static const char rcsid[] = "$Id: ns_date.c,v 1.1 2008/08/01 17:15:09 drepper Exp $"; +static const char rcsid[] = "$Id$"; #endif /* Import. */ |