summaryrefslogtreecommitdiff
path: root/Docs
diff options
context:
space:
mode:
authorunknown <kent@kent-amd64.(none)>2007-02-28 22:34:34 +0100
committerunknown <kent@kent-amd64.(none)>2007-02-28 22:34:34 +0100
commitf835ac88b802daee410914b8c9a4128be51ef988 (patch)
treee2dbc7bf09f8d20c9a649b14835556c24483561a /Docs
parente0ca832bdb230c0da763f96250189f7e3ad439e8 (diff)
parent858ea1bf0537984361cb11820801cc9737c7baaa (diff)
downloadmariadb-git-f835ac88b802daee410914b8c9a4128be51ef988.tar.gz
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build Docs/Makefile.am: Auto merged
Diffstat (limited to 'Docs')
-rw-r--r--Docs/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/Docs/Makefile.am b/Docs/Makefile.am
index af7448040d8..e57a1abcb0c 100644
--- a/Docs/Makefile.am
+++ b/Docs/Makefile.am
@@ -17,7 +17,7 @@ noinst_SCRIPTS = generate-text-files.pl
EXTRA_DIST = $(noinst_SCRIPTS) manual.chm mysql.info INSTALL-BINARY
-TXT_FILES= ../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \
+TXT_FILES= ../INSTALL-SOURCE ../INSTALL-WIN-SOURCE \
INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
all-local: $(TXT_FILES)