diff options
| author | unknown <monty@mysql.com> | 2004-05-26 00:02:06 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-26 00:02:06 +0300 |
| commit | afef7ce3c7edb5635c9a98bd4a904f05fd87ef51 (patch) | |
| tree | 43a8762c2d374d9facf53f88d86ec49b52cb8fe2 /include/Makefile.am | |
| parent | a9b481d3cd7fbf832b17523c521185db6366492c (diff) | |
| parent | fd079fdaa15ce2ed1b2d59cc6ff7dcba2bbc4112 (diff) | |
| download | mariadb-git-afef7ce3c7edb5635c9a98bd4a904f05fd87ef51.tar.gz | |
Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
include/Makefile.am:
Auto merged
Diffstat (limited to 'include/Makefile.am')
| -rw-r--r-- | include/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 01b8f295be4..10e1b12a770 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -26,7 +26,7 @@ pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \ noinst_HEADERS = config-win.h config-os2.h config-netware.h \ nisam.h heap.h merge.h my_bitmap.h\ myisam.h myisampack.h myisammrg.h ft_global.h\ - mysys_err.h my_base.h \ + mysys_err.h my_base.h help_start.h help_end.h \ my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \ my_aes.h my_tree.h hash.h thr_alarm.h \ thr_lock.h t_ctype.h violite.h md5.h \ |