summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorTomas Mraz <tmraz@redhat.com>2012-08-07 12:23:17 +0200
committerTomas Mraz <tmraz@redhat.com>2012-08-07 12:23:17 +0200
commit70ef5a4310268c1264f116efdc70a60c0a0dbb4d (patch)
tree9f64a6109363a98a17cb5d78314483e6b300ff84 /COPYING
parent65b93950559daf28a156a9779f8e72edcd57cdc1 (diff)
downloadlibpwquality-70ef5a4310268c1264f116efdc70a60c0a0dbb4d.tar.gz
Clarified alternative licensing to GPLv2+.
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING6
1 files changed, 2 insertions, 4 deletions
diff --git a/COPYING b/COPYING
index eac951b..5d19846 100644
--- a/COPYING
+++ b/COPYING
@@ -21,10 +21,8 @@ conditions are met:
written permission.
ALTERNATIVELY, this product may be distributed under the terms of the
-GNU General Public License, in which case the provisions of the GNU
-GPL are required INSTEAD OF the above restrictions. (This clause is
-necessary due to a potential conflict between the GNU GPL and the
-restrictions contained in a BSD-style copyright.)
+GNU General Public License version 2 or later, in which case the provisions
+of the GNU GPL are required INSTEAD OF the above restrictions.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF