diff options
| author | unknown <evgen@moonbone.local> | 2006-07-18 23:45:17 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-07-18 23:45:17 +0400 |
| commit | dc50ce997083b4f3d3e4ab237c6a1f5e11cfd90f (patch) | |
| tree | a7cde77bb894ad2fe7efa42cf6785616d7604353 /extra/yassl/taocrypt/src/bftables.cpp | |
| parent | ec40f4a588faa4b759816fd619929088b0723c24 (diff) | |
| parent | 7c7396cee5e8f88763a7b3468f4ae3f543195cf2 (diff) | |
| download | mariadb-git-dc50ce997083b4f3d3e4ab237c6a1f5e11cfd90f.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
client/mysql.cc:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
mysql-test/t/func_str.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/time.cc:
Auto merged
Diffstat (limited to 'extra/yassl/taocrypt/src/bftables.cpp')
| -rw-r--r-- | extra/yassl/taocrypt/src/bftables.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/extra/yassl/taocrypt/src/bftables.cpp b/extra/yassl/taocrypt/src/bftables.cpp index e072b117f54..2dbb6c01674 100644 --- a/extra/yassl/taocrypt/src/bftables.cpp +++ b/extra/yassl/taocrypt/src/bftables.cpp @@ -9,6 +9,10 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * + * There are special exceptions to the terms and conditions of the GPL as it + * is applied to yaSSL. View the full text of the exception in the file + * FLOSS-EXCEPTIONS in the directory of this software distribution. + * * yaSSL is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |