diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-03-12 13:29:11 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-03-12 13:29:11 +0100 |
| commit | e5ec52414c33ab8956542a1cba0e8bdb4fd43491 (patch) | |
| tree | 5061b7d8da5dd04e910dd576401aa3efe9bf1196 /mysys/Makefile.am | |
| parent | d2499e2dd1874ce62f4ff6d78b77be8e7e8e5480 (diff) | |
| parent | deeb3ee4258852940e48b0b7b950bc5e951831b4 (diff) | |
| download | mariadb-git-e5ec52414c33ab8956542a1cba0e8bdb4fd43491.tar.gz | |
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
configure.in:
Auto merged
mysys/Makefile.am:
Auto merged
BitKeeper/deleted/.del-mysys.dsp~32695fee91189326:
Auto merged
BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822:
Auto merged
BitKeeper/deleted/.del-mysys_ia64.dsp~7a98bd8cd01d3043:
Auto merged
Diffstat (limited to 'mysys/Makefile.am')
| -rw-r--r-- | mysys/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/Makefile.am b/mysys/Makefile.am index fd6a0f76332..794b8b8369b 100644 --- a/mysys/Makefile.am +++ b/mysys/Makefile.am @@ -47,7 +47,7 @@ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \ my_sync.c my_getopt.c my_mkdir.c \ default_modify.c default.c \ my_compress.c checksum.c \ - my_net.c my_semaphore.c my_port.c my_sleep.c \ + my_net.c my_port.c my_sleep.c \ charset.c charset-def.c my_bitmap.c my_bit.c md5.c \ my_gethostbyname.c rijndael.c my_aes.c sha1.c \ my_handler.c my_netware.c my_largepage.c \ |