diff options
| author | unknown <reggie@mdk10.(none)> | 2005-05-20 16:34:59 -0500 |
|---|---|---|
| committer | unknown <reggie@mdk10.(none)> | 2005-05-20 16:34:59 -0500 |
| commit | 606d8a5ab0000ccf1120201db21f92ef69b52a5c (patch) | |
| tree | 1467155c10e8996d9cce3ec39db813852687c942 /mysys/Makefile.am | |
| parent | 03e26e50b9829124246ffb6b755e3809c126cb95 (diff) | |
| parent | c1ae672adda45a1b8c5637b8f4d6a3f91378ea20 (diff) | |
| download | mariadb-git-606d8a5ab0000ccf1120201db21f92ef69b52a5c.tar.gz | |
fixed conflicts
VC++Files/mysys/mysys.dsp:
Auto merged
include/my_sys.h:
Auto merged
sql/sql_db.cc:
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 40743e36c29..03ee692645f 100644 --- a/mysys/Makefile.am +++ b/mysys/Makefile.am @@ -54,7 +54,7 @@ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.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 \ - my_windac.c + my_windac.c my_access.c EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \ thr_mutex.c thr_rwlock.c libmysys_a_LIBADD = @THREAD_LOBJECTS@ |