summaryrefslogtreecommitdiff
path: root/sql/share/charsets/geostd8.xml
diff options
context:
space:
mode:
authoracurtis/antony@xiphis.org/ltamd64.xiphis.org <>2006-12-26 16:23:05 -0800
committeracurtis/antony@xiphis.org/ltamd64.xiphis.org <>2006-12-26 16:23:05 -0800
commit82b03f29aca45ac4796ab6db8615651c75648328 (patch)
treea659f9a60eff4e3c972feb3204d501eca9bba470 /sql/share/charsets/geostd8.xml
parent591712f53fb0c81bbec4a0b2eb087088280c1468 (diff)
parent226a5c833f3084bc634996c70d47a1c0d9164e0d (diff)
downloadmariadb-git-82b03f29aca45ac4796ab6db8615651c75648328.tar.gz
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
into xiphis.org:/home/antony/work2/mysql-5.0-engines-merge
Diffstat (limited to 'sql/share/charsets/geostd8.xml')
-rw-r--r--sql/share/charsets/geostd8.xml3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/share/charsets/geostd8.xml b/sql/share/charsets/geostd8.xml
index c09aa078fb7..5e3816975d6 100644
--- a/sql/share/charsets/geostd8.xml
+++ b/sql/share/charsets/geostd8.xml
@@ -7,8 +7,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