summaryrefslogtreecommitdiff
path: root/include/my_tree.h
diff options
context:
space:
mode:
authorkent@kent-amd64.(none) <>2006-12-23 20:20:40 +0100
committerkent@kent-amd64.(none) <>2006-12-23 20:20:40 +0100
commitbe15e3bc15921085ea558f8764ed1fad137ccaa1 (patch)
tree5283b715c9535e3fdade4d3cf17559c467d87078 /include/my_tree.h
parent3368730535915c58d8bb68cffc35c53192002de6 (diff)
parent226a5c833f3084bc634996c70d47a1c0d9164e0d (diff)
downloadmariadb-git-be15e3bc15921085ea558f8764ed1fad137ccaa1.tar.gz
Merge mysql.com:/home/kent/bk/main/mysql-5.0
into mysql.com:/home/kent/bk/main/mysql-5.1
Diffstat (limited to 'include/my_tree.h')
-rw-r--r--include/my_tree.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/my_tree.h b/include/my_tree.h
index 68a2ea777c0..380fc1c9b26 100644
--- a/include/my_tree.h
+++ b/include/my_tree.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