summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorkent@kent-amd64.(none) <>2006-12-31 01:32:21 +0100
committerkent@kent-amd64.(none) <>2006-12-31 01:32:21 +0100
commit58763e383e40331b7010bf3280904efe4d4fc3df (patch)
treefa5f0a9d02637384a995bfbff6cf3b5184b4e1df /Makefile.am
parent895e442dbfe8348f69388f6d181481a1b7576ca8 (diff)
parent1b8bd0d246f26fa05f9974005dc10cc647754ee1 (diff)
downloadmariadb-git-58763e383e40331b7010bf3280904efe4d4fc3df.tar.gz
Merge mysql.com:/home/kent/bk/main/mysql-5.0
into mysql.com:/home/kent/bk/main/mysql-5.1
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index f2b01afe5e6..7c80ea24326 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000-2006 MySQL AB
#
# 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
@@ -159,4 +159,3 @@ test-force-full-pl: test-force-full
# Don't update the files from bitkeeper
%::SCCS/s.%
-