diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-03 19:10:10 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-03 19:10:10 +0300 |
| commit | 1be5462d59fa5fbd1ca92286c3a0a049c00f4bb9 (patch) | |
| tree | 17ba1ed90233efa64bc83364ed1ffb74dd637ead /mysql-test/Makefile.am | |
| parent | ce55d37929fc91b476541d3a77336a44b20317ac (diff) | |
| parent | 90e058e0c623f770ee602ebab86e91303f08c90a (diff) | |
| download | mariadb-git-1be5462d59fa5fbd1ca92286c3a0a049c00f4bb9.tar.gz | |
Merge with MariaDB 5.1
Diffstat (limited to 'mysql-test/Makefile.am')
| -rw-r--r-- | mysql-test/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index cbfef2b2af2..4ce17815f9f 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2000-2006 MySQL AB +# Copyright (c) 2000, 2010, Oracle and/or its affiliates. +# Copyright (c) 2009-2011, Monty Program Ab # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public @@ -10,10 +11,9 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Library General Public License for more details. # -# You should have received a copy of the GNU Library General Public -# License along with this library; if not, write to the Free -# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -# MA 02111-1307, USA +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## Process this file with automake to create Makefile.in |