summaryrefslogtreecommitdiff
path: root/libmysql/Makefile.am
diff options
context:
space:
mode:
authorserg@serg.mylan <>2004-08-18 19:57:55 +0200
committerserg@serg.mylan <>2004-08-18 19:57:55 +0200
commite1237cbc53355382e032f0e88f906d67edd1f597 (patch)
tree8ac7985dc9b6caddd1c2402ef8606e4a4cd85ada /libmysql/Makefile.am
parent7c69afaf15eda7d51b2254e71c7078aaab3aa0f3 (diff)
parent8ce92878a2c32785a5af86e9ffa27b4904d01694 (diff)
downloadmariadb-git-e1237cbc53355382e032f0e88f906d67edd1f597.tar.gz
manually merged
Diffstat (limited to 'libmysql/Makefile.am')
-rw-r--r--libmysql/Makefile.am15
1 files changed, 9 insertions, 6 deletions
diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am
index 7e43ff751f9..5c2dc9c7ba6 100644
--- a/libmysql/Makefile.am
+++ b/libmysql/Makefile.am
@@ -1,9 +1,12 @@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000-2004 MySQL AB
#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 GNU General Public License as
+# published by the Free Software Foundation.
+#
+# There are special exceptions to the terms and conditions of the GPL as it
+# is applied to this software. View the full text of the exception in file
+# EXCEPTIONS-CLIENT in the directory of this software distribution.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +17,7 @@
# License along with this library; if not, write to the Free
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA
-
+#
# This file is public domain and comes with NO WARRANTY of any kind
target = libmysqlclient.la