summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorkent@mysql.com/kent-amd64.(none) <>2006-12-31 01:04:07 +0100
committerkent@mysql.com/kent-amd64.(none) <>2006-12-31 01:04:07 +0100
commit1b8bd0d246f26fa05f9974005dc10cc647754ee1 (patch)
treeccace61b3d37f7480a06ecda03b0cfc451f58474 /support-files
parent344d78a56328c1a9e77f8eb2f247d20ced3ce816 (diff)
parent6523aca7291d55b7fcb7668610a6fb0c752a3770 (diff)
downloadmariadb-git-1b8bd0d246f26fa05f9974005dc10cc647754ee1.tar.gz
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/kent/bk/main/mysql-5.0
Diffstat (limited to 'support-files')
-rw-r--r--support-files/MacOSX/Makefile.am2
-rw-r--r--support-files/Makefile.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/support-files/MacOSX/Makefile.am b/support-files/MacOSX/Makefile.am
index 24649fb9021..85ccb9c126d 100644
--- a/support-files/MacOSX/Makefile.am
+++ b/support-files/MacOSX/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2003-2006 MySQL AB
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Library General Public
diff --git a/support-files/Makefile.am b/support-files/Makefile.am
index 3fccc777743..da8c25ccb1e 100644
--- a/support-files/Makefile.am
+++ b/support-files/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000-2001, 2003-2006 MySQL AB
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Library General Public