summaryrefslogtreecommitdiff
path: root/libmysql_r/Makefile.am
diff options
context:
space:
mode:
authorBjorn Munch <bjorn.munch@oracle.com>2010-12-20 12:58:33 +0100
committerBjorn Munch <bjorn.munch@oracle.com>2010-12-20 12:58:33 +0100
commitde83ad9073154e352201ddae0649bab0fd16689d (patch)
tree2fe3426f72edd431023880069cd890d273c7f800 /libmysql_r/Makefile.am
parent154279419d7bf6f1c7e1a630ed22dc1ba0aad5b6 (diff)
parent13c6af0eab384632e3cb954e5ba7d7c51d537d4f (diff)
downloadmariadb-git-de83ad9073154e352201ddae0649bab0fd16689d.tar.gz
new merge from 5.1
Diffstat (limited to 'libmysql_r/Makefile.am')
-rw-r--r--libmysql_r/Makefile.am3
1 files changed, 1 insertions, 2 deletions
diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am
index 4a37dcfdec9..d4f0bea590b 100644
--- a/libmysql_r/Makefile.am
+++ b/libmysql_r/Makefile.am
@@ -5,8 +5,7 @@
# 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.
+# is applied to this software.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of