Commit f835ac88 authored by unknown's avatar unknown
Browse files

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
parents e0ca832b 858ea1bf

Docs/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -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)