diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-21 14:30:47 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-21 14:30:47 +0100 |
| commit | 2176fef44694e7980c39c536640a62b87517994d (patch) | |
| tree | fc91790b327404a804ed62021d2a2491d2092551 /client | |
| parent | 971f15f83f13dd61d967fffc8d305c3a2ff8f6d1 (diff) | |
| parent | 20554a6c356f8badcc55213f2f4a0f5d9933fa70 (diff) | |
| download | mariadb-git-2176fef44694e7980c39c536640a62b87517994d.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023:
Auto merged
BitKeeper/deleted/.del-test_db.sql:
Auto merged
mysql-test/install_test_db.sh:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.h:
Auto merged
netware/Makefile.am:
Manual merge
Diffstat (limited to 'client')
| -rw-r--r-- | client/echo.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/client/echo.c b/client/echo.c index 4483eaad293..e3d22edb3ae 100644 --- a/client/echo.c +++ b/client/echo.c @@ -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 |