diff options
author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-12-06 08:54:53 +0000 |
---|---|---|
committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-12-06 08:54:53 +0000 |
commit | 878a155e50f396069ff0f2cb9a66e5f3e042ddb4 (patch) | |
tree | e3b2a03246ee409037986a7bd13a24af93979cf8 /merge/make-ccc | |
parent | 77a9eede5d2c4dca4973afd266b0b1218b196d4e (diff) | |
parent | ca2e6e8192e082dc16dad8a88d98476f1281383d (diff) | |
download | mariadb-git-878a155e50f396069ff0f2cb9a66e5f3e042ddb4.tar.gz |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
configure.in:
Auto merged
Diffstat (limited to 'merge/make-ccc')
0 files changed, 0 insertions, 0 deletions