diff options
| author | unknown <msvensson@neptunus.(none)> | 2007-01-22 16:58:21 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2007-01-22 16:58:21 +0100 |
| commit | c962dde03ec8352f5ffa26f2fd07c6846faf55b2 (patch) | |
| tree | 6dcdd3cadc1f218a03dfa7ef98f8083f333fcd83 /extra/yassl/taocrypt/README | |
| parent | 1d82f97c8389885975325d8482cb0724e9f061b4 (diff) | |
| parent | 5e50052234dcf8c8d8d3fa1efca8fc5d94e686e2 (diff) | |
| download | mariadb-git-c962dde03ec8352f5ffa26f2fd07c6846faf55b2.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
extra/yassl/include/openssl/ssl.h:
Auto merged
extra/yassl/src/ssl.cpp:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~10:
Auto merged
Diffstat (limited to 'extra/yassl/taocrypt/README')
0 files changed, 0 insertions, 0 deletions