diff options
author | unknown <dlenev@mysql.com> | 2005-01-18 22:13:05 +0300 |
---|---|---|
committer | unknown <dlenev@mysql.com> | 2005-01-18 22:13:05 +0300 |
commit | 491ee3dc450cdfa4cc63fd426efd605669c5354e (patch) | |
tree | 34facdb12da545fb31bc1262409a7e5f185ae4f1 /strings | |
parent | c2ce32bd096c9c95918d614fd9916899880ea0f9 (diff) | |
parent | ca252acbcd1439eeba5b6098c183ae932de4805e (diff) | |
download | mariadb-git-491ee3dc450cdfa4cc63fd426efd605669c5354e.tar.gz |
Merge mysql.com:/home/dlenev/src/mysql-4.1-merges
into mysql.com:/home/dlenev/src/mysql-5.0-merges
client/Makefile.am:
Auto merged
strings/Makefile.am:
Auto merged
Diffstat (limited to 'strings')
-rw-r--r-- | strings/Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/strings/Makefile.am b/strings/Makefile.am index 508c127dcb4..62b20b56a8b 100644 --- a/strings/Makefile.am +++ b/strings/Makefile.am @@ -40,7 +40,6 @@ endif libmystrings_a_SOURCES = $(ASRCS) $(CSRCS) noinst_PROGRAMS = conf_to_src -DISTCLEANFILES = ctype_autoconf.c # Default charset definitions EXTRA_DIST = ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjpms.c ctype-euc_kr.c ctype-win1250ch.c \ ctype-gb2312.c ctype-gbk.c ctype-sjis.c ctype-utf8.c \ |