diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-24 14:07:30 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-24 14:07:30 +0200 |
| commit | d5ede428bc96034dac3e31048a763c0d1bdd0a6b (patch) | |
| tree | 1adee5081e56f21a474c3adc6199fbacdf40b9c3 /include/Makefile.am | |
| parent | 5018e6660f673ec2ec72ee30a489bfea0c79e405 (diff) | |
| parent | f692f710b759cc697176405aedd39bf094240269 (diff) | |
| download | mariadb-git-d5ede428bc96034dac3e31048a763c0d1bdd0a6b.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
include/m_ctype.h:
Auto merged
include/my_global.h:
Auto merged
include/my_sys.h:
Auto merged
include/Makefile.am:
Manual merge
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 990954b7cbf..cdf86820943 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -26,7 +26,7 @@ pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \ errmsg.h my_global.h my_net.h \ my_getopt.h sslopt-longopts.h my_dir.h \ sslopt-vars.h sslopt-case.h sql_common.h keycache.h \ - m_ctype.h mysql/plugin.h $(HEADERS_GEN) + m_ctype.h mysql/plugin.h my_attribute.h $(HEADERS_GEN) noinst_HEADERS = config-win.h config-netware.h \ heap.h my_bitmap.h my_uctype.h \ myisam.h myisampack.h myisammrg.h ft_global.h\ |