diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-12-26 22:28:28 -0700 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-12-26 22:28:28 -0700 |
| commit | f7f69043ac98d11ddeb124b9944ff369aa5f766f (patch) | |
| tree | 5f7a3a3b0a880c0f3e9cd49a429b8febcd020650 /vio/viossl.c | |
| parent | 1fdda68914a7a3ccb9527177100fff5b07972e69 (diff) | |
| parent | 5d68cff03a464571b5a9460c0b20edc559cd14db (diff) | |
| download | mariadb-git-f7f69043ac98d11ddeb124b9944ff369aa5f766f.tar.gz | |
Merge siva.hindu.god:/usr/home/tim/m/bk/g50
into siva.hindu.god:/usr/home/tim/m/bk/50
Makefile.am:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqltest.c:
Auto merged
include/config-win.h:
Auto merged
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
include/mysql.h:
Auto merged
include/typelib.h:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysys/default.c:
Auto merged
mysys/my_wincond.c:
Auto merged
mysys/typelib.c:
Auto merged
server-tools/instance-manager/guardian.cc:
Auto merged
server-tools/instance-manager/instance.cc:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/net_serv.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/share/charsets/hebrew.xml:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
strings/conf_to_src.c:
Auto merged
vio/viossl.c:
Auto merged
Diffstat (limited to 'vio/viossl.c')
| -rw-r--r-- | vio/viossl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vio/viossl.c b/vio/viossl.c index 806f6fc356a..4267486112f 100644 --- a/vio/viossl.c +++ b/vio/viossl.c @@ -2,8 +2,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of |