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 /configure.in | |
| 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 'configure.in')
| -rw-r--r-- | configure.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 61cad0fa8da..0fe2f1b5510 100644 --- a/configure.in +++ b/configure.in @@ -2665,7 +2665,6 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl cmd-line-utils/Makefile cmd-line-utils/libedit/Makefile dnl libmysqld/Makefile libmysqld/examples/Makefile dnl mysql-test/Makefile dnl - debian/Makefile debian/defs.mk debian/control dnl mysql-test/ndb/Makefile netware/Makefile sql-bench/Makefile dnl include/mysql_version.h plugin/Makefile win/Makefile) |