diff options
author | unknown <msvensson@pilot.blaudden> | 2007-03-28 15:57:27 +0200 |
---|---|---|
committer | unknown <msvensson@pilot.blaudden> | 2007-03-28 15:57:27 +0200 |
commit | 70ae657cc20b2901a28e58521b427570865a30c2 (patch) | |
tree | dca7aaa21e51f58a292650fe93a49debb052746b /extra/yassl/include/socket_wrapper.hpp | |
parent | f86a489f76ffd5dcbbf3b8a66c55e48c7e68ae95 (diff) | |
parent | 1778d177be6363c88c58cb8eafaa0f530a97d593 (diff) | |
download | mariadb-git-70ae657cc20b2901a28e58521b427570865a30c2.tar.gz |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
extra/yassl/include/openssl/ssl.h:
Auto merged
extra/yassl/src/ssl.cpp:
Auto merged
include/violite.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
Diffstat (limited to 'extra/yassl/include/socket_wrapper.hpp')
0 files changed, 0 insertions, 0 deletions