diff options
| author | kent@kent-amd64.(none) <> | 2006-12-31 01:32:21 +0100 |
|---|---|---|
| committer | kent@kent-amd64.(none) <> | 2006-12-31 01:32:21 +0100 |
| commit | 58763e383e40331b7010bf3280904efe4d4fc3df (patch) | |
| tree | fa5f0a9d02637384a995bfbff6cf3b5184b4e1df /zlib | |
| parent | 895e442dbfe8348f69388f6d181481a1b7576ca8 (diff) | |
| parent | 1b8bd0d246f26fa05f9974005dc10cc647754ee1 (diff) | |
| download | mariadb-git-58763e383e40331b7010bf3280904efe4d4fc3df.tar.gz | |
Merge mysql.com:/home/kent/bk/main/mysql-5.0
into mysql.com:/home/kent/bk/main/mysql-5.1
Diffstat (limited to 'zlib')
| -rw-r--r-- | zlib/Makefile.am | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/zlib/Makefile.am b/zlib/Makefile.am index 120a851cf09..c40c922851e 100644 --- a/zlib/Makefile.am +++ b/zlib/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2004 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +# Copyright (C) 2004-2006 MySQL AB # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -31,3 +31,6 @@ libz_la_SOURCES= adler32.c compress.c crc32.c deflate.c gzio.c \ uncompr.c zutil.c EXTRA_DIST= README FAQ INDEX ChangeLog algorithm.txt zlib.3 CMakeLists.txt + +# Don't update the files from bitkeeper +%::SCCS/s.% |