diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-11-02 13:17:07 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-11-02 13:17:07 +0100 |
| commit | 51d5e8b6767158a06da6a4aa82a61c0be927f845 (patch) | |
| tree | 9cfd641b0186f0e2aed7de85454b4cf2513279f7 /Docs | |
| parent | aa38226679b4936ef06d9b8c4189cd0295256e41 (diff) | |
| parent | ae53002e6e0cccd8d4b17f24a00c6ec98d63d4c1 (diff) | |
| download | mariadb-git-51d5e8b6767158a06da6a4aa82a61c0be927f845.tar.gz | |
Merge mysql.com:/home/kent/bk/bug25205/mysql-5.0-build
into mysql.com:/home/kent/bk/bug25205/mysql-5.1-build
Docs/Makefile.am:
Auto merged
Diffstat (limited to 'Docs')
| -rw-r--r-- | Docs/Makefile.am | 2 | ||||
| -rw-r--r-- | Docs/manual.chm | 14 |
2 files changed, 1 insertions, 15 deletions
diff --git a/Docs/Makefile.am b/Docs/Makefile.am index d161836aaca..dac256f8fd6 100644 --- a/Docs/Makefile.am +++ b/Docs/Makefile.am @@ -13,7 +13,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -EXTRA_DIST = manual.chm mysql.info INSTALL-BINARY +EXTRA_DIST = mysql.info INSTALL-BINARY # make sure that "make install" installs the info page, too # automake only seems to take care of this automatically, diff --git a/Docs/manual.chm b/Docs/manual.chm deleted file mode 100644 index 28c3e1b5a86..00000000000 --- a/Docs/manual.chm +++ /dev/null @@ -1,14 +0,0 @@ - -********************************************************* - -This is a dummy placeholder file for "manual.chm" in the -MySQL source trees. - -Note, that the documentation has been moved into a separate -BitKeeper source tree named "mysqldoc" - do not attempt to edit this -file! All changes to it should be done in the mysqldoc tree. - -This dummy file is being replaced with the actual file from the -mysqldoc tree when building the official source distribution. - -********************************************************* |