diff options
author | tsmith/tim@siva.hindu.god <> | 2006-12-26 22:28:28 -0700 |
---|---|---|
committer | tsmith/tim@siva.hindu.god <> | 2006-12-26 22:28:28 -0700 |
commit | 682596d7ce081c6382316f9efa7a8b7e6881bdf2 (patch) | |
tree | 5f7a3a3b0a880c0f3e9cd49a429b8febcd020650 /scripts | |
parent | 828121bd6d3e2fc3fbbde554fbf5182517698bb8 (diff) | |
parent | 82b03f29aca45ac4796ab6db8615651c75648328 (diff) | |
download | mariadb-git-682596d7ce081c6382316f9efa7a8b7e6881bdf2.tar.gz |
Merge siva.hindu.god:/usr/home/tim/m/bk/g50
into siva.hindu.god:/usr/home/tim/m/bk/50
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/Makefile.am | 3 | ||||
-rw-r--r-- | scripts/fill_help_tables.sh | 3 | ||||
-rw-r--r-- | scripts/mysql_config.sh | 3 | ||||
-rw-r--r-- | scripts/mysql_secure_installation.sh | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 5f49620c975..585c8ca8655 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -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 diff --git a/scripts/fill_help_tables.sh b/scripts/fill_help_tables.sh index fc0c684c2dc..1a9f63e36d9 100644 --- a/scripts/fill_help_tables.sh +++ b/scripts/fill_help_tables.sh @@ -498,8 +498,7 @@ print <<EOF; -- -- 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 diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index 92201a2c8af..b47e7740c75 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -3,8 +3,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 diff --git a/scripts/mysql_secure_installation.sh b/scripts/mysql_secure_installation.sh index 1c7ca34ad59..f437a3d8bfc 100644 --- a/scripts/mysql_secure_installation.sh +++ b/scripts/mysql_secure_installation.sh @@ -4,8 +4,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 |