diff options
| author | unknown <acurtis/antony@xiphis.org/ltamd64.xiphis.org> | 2006-12-26 16:23:05 -0800 |
|---|---|---|
| committer | unknown <acurtis/antony@xiphis.org/ltamd64.xiphis.org> | 2006-12-26 16:23:05 -0800 |
| commit | 5d68cff03a464571b5a9460c0b20edc559cd14db (patch) | |
| tree | a659f9a60eff4e3c972feb3204d501eca9bba470 /client/my_readline.h | |
| parent | f63d8c8d0c4a57b9f77a1c190cde4de7ad91bf81 (diff) | |
| parent | 6b0853a3983803b296232311715c890210dbbee6 (diff) | |
| download | mariadb-git-5d68cff03a464571b5a9460c0b20edc559cd14db.tar.gz | |
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
into xiphis.org:/home/antony/work2/mysql-5.0-engines-merge
myisam/mi_check.c:
Auto merged
myisam/mi_dynrec.c:
Auto merged
myisam/mi_packrec.c:
Auto merged
myisam/mi_range.c:
Auto merged
myisam/mi_test1.c:
Auto merged
myisam/mi_write.c:
Auto merged
myisam/rt_split.c:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'client/my_readline.h')
| -rw-r--r-- | client/my_readline.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/client/my_readline.h b/client/my_readline.h index 6052d462ab9..47be7fa9294 100644 --- a/client/my_readline.h +++ b/client/my_readline.h @@ -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 |