summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <joerg@trift2.>2006-11-28 13:03:32 +0100
committerunknown <joerg@trift2.>2006-11-28 13:03:32 +0100
commitc8b23c3796fef574c79e00b163d049946ce31bd1 (patch)
treec158b10ebdd3c5772e60cfbcc0aa949373ccc103
parent344db8ab5d32ea0ecdd07be6b9f23ca1133dcd25 (diff)
parent94d7389b329998b32312841bd038cdea04a5974a (diff)
downloadmariadb-git-c8b23c3796fef574c79e00b163d049946ce31bd1.tar.gz
Merge trift2.:/M50/mysql-5.0
into trift2.:/MySQL/M50/push-5.0 extra/yassl/taocrypt/taocrypt.dsp: Auto merged extra/yassl/yassl.dsp: Auto merged extra/yassl/yassl.vcproj: Auto merged extra/yassl/taocrypt/taocrypt.vcproj: Auto merged extra/yassl/taocrypt/benchmark/benchmark.dsp: Auto merged extra/yassl/taocrypt/test.dsp: Auto merged extra/yassl/testsuite/testsuite.dsp: Auto merged
0 files changed, 0 insertions, 0 deletions