summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorunknown <lenz@mysql.com>2005-04-13 19:46:26 +0200
committerunknown <lenz@mysql.com>2005-04-13 19:46:26 +0200
commit3d73ea281d4ed65497b92d592c1bbf1caa0e5b2d (patch)
tree062cab7826ac51a8508bc7ee6ea88cd0b833514c /configure.in
parent26d7574462a8abb69c55f5280d43ce15b66b3a29 (diff)
parentc80e4f1affc9b037f56428f18642c5768300bdac (diff)
downloadmariadb-git-3d73ea281d4ed65497b92d592c1bbf1caa0e5b2d.tar.gz
- After merge fixes
BitKeeper/deleted/.del-Do-compile~d1a6d7e535befea3: Auto merged BitKeeper/deleted/.del-Makefile.am~8eda4336dfcaefc: Auto merged BitKeeper/deleted/.del-mysqld_error.txt~95f167eb567c789d: Auto merged scripts/Makefile.am: Auto merged scripts/make_win_src_distribution.sh: Auto merged BitKeeper/deleted/.del-texi2html~74632fe370dcec73: Auto merged configure.in: - manual merge support-files/mysql.spec.sh: - manual merge
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index e98d032abc6..ff4527ee09f 100644
--- a/configure.in
+++ b/configure.in
@@ -2753,7 +2753,7 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
dbug/Makefile scripts/Makefile dnl
include/Makefile sql-bench/Makefile tools/Makefile dnl
server-tools/Makefile server-tools/instance-manager/Makefile dnl
- tests/Makefile Docs/Makefile Docs/Images/Makefile support-files/Makefile dnl
+ tests/Makefile Docs/Makefile support-files/Makefile dnl
support-files/MacOSX/Makefile mysql-test/Makefile dnl
netware/Makefile dnl
include/mysql_version.h dnl