diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-02-28 22:33:29 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-02-28 22:33:29 +0100 |
| commit | 858ea1bf0537984361cb11820801cc9737c7baaa (patch) | |
| tree | 85e8874d3d287351cfd79b154708584d3b0586b2 | |
| parent | f2bd13f6cf1944cda1038d6cac10c67fc62aae96 (diff) | |
| parent | ff71e7311cd2cab267f2ffc59dc8ef2502423ce4 (diff) | |
| download | mariadb-git-858ea1bf0537984361cb11820801cc9737c7baaa.tar.gz | |
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
Docs/Makefile.am:
Auto merged
| -rw-r--r-- | Docs/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Docs/Makefile.am b/Docs/Makefile.am index e00d90c2d84..369e02e4654 100644 --- a/Docs/Makefile.am +++ b/Docs/Makefile.am @@ -17,7 +17,7 @@ noinst_SCRIPTS = Support/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) |