diff options
| author | unknown <mtaylor@solace.(none)> | 2007-10-12 02:18:13 -0700 |
|---|---|---|
| committer | unknown <mtaylor@solace.(none)> | 2007-10-12 02:18:13 -0700 |
| commit | bbbe064bf133adb9725c2b0af8df42b50fddd6d5 (patch) | |
| tree | a7c7fed302b95761c5b27adff001daa89dd04695 /Makefile.am | |
| parent | b164a8ab7ca45a9b8efc86d1bf3e840d72f786ae (diff) | |
| parent | c236111f6c69d6f7f0d9b20d3ff28dd591cf1d53 (diff) | |
| download | mariadb-git-bbbe064bf133adb9725c2b0af8df42b50fddd6d5.tar.gz | |
Merge solace.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
into solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
BitKeeper/deleted/.del-changelog:
Auto merged
BitKeeper/deleted/.del-libmysqlclientSLIB-dev.files.in:
Auto merged
BitKeeper/deleted/.del-mysql-client-BASE.files.in:
Auto merged
BitKeeper/deleted/.del-mysql-server-BASE.files.in:
Auto merged
configure.in:
Auto merged
BitKeeper/deleted/.del-mysql-test-BASE.files.in:
Auto merged
BitKeeper/deleted/.del-rules:
Auto merged
Makefile.am:
Merged in removal of debian dir from 5.0-maint
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index f29764e4143..c968c50f6bc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,8 +38,7 @@ DIST_SUBDIRS = . include Docs zlib \ netware libmysqld \ mysql-test support-files sql-bench server-tools \ win \ - BUILD debian - + BUILD DISTCLEANFILES = ac_available_languages_fragment # Create permission databases |