From 9a45c4aa6640b9f8ee1b6bcc9178e2f791dc19e0 Mon Sep 17 00:00:00 2001 From: Erik Ekman Date: Thu, 7 Aug 2014 21:14:10 +0200 Subject: [PATCH] Change license wording to follow ISC license exactly "Permission to use, copy, modify, and distribute this software" is now "Permission to use, copy, modify, and/or distribute this software". Add license header to source files missing one. --- README.md | 2 +- src/android_dns.h | 15 +++++++++++++++ src/base128.c | 2 +- src/base128.h | 2 +- src/base32.c | 2 +- src/base32.h | 2 +- src/base64.c | 2 +- src/base64.h | 2 +- src/client.c | 2 +- src/client.h | 2 +- src/common.c | 2 +- src/common.h | 2 +- src/dns.c | 2 +- src/dns.h | 2 +- src/encoding.c | 2 +- src/encoding.h | 2 +- src/fw_query.c | 2 +- src/fw_query.h | 2 +- src/iodine.c | 2 +- src/iodined.c | 2 +- src/login.c | 2 +- src/login.h | 2 +- src/read.c | 2 +- src/read.h | 2 +- src/tun.c | 2 +- src/tun.h | 2 +- src/user.c | 2 +- src/user.h | 2 +- src/util.c | 2 +- src/util.h | 17 +++++++++++++++++ src/version.h | 2 +- src/windows.h | 2 +- tests/base32.c | 2 +- tests/base64.c | 2 +- tests/common.c | 17 +++++++++++++++++ tests/dns.c | 2 +- tests/encoding.c | 2 +- tests/fw_query.c | 2 +- tests/login.c | 2 +- tests/read.c | 2 +- tests/test.c | 2 +- tests/test.h | 2 +- tests/user.c | 2 +- 43 files changed, 89 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index 033545c..5ef7446 100644 --- a/README.md +++ b/README.md @@ -385,7 +385,7 @@ AUTHORS & LICENSE Copyright (c) 2006-2014 Erik Ekman , 2006-2009 Bjorn Andersson . Also major contributions by Anne Bezemer. -Permission to use, copy, modify, and distribute this software for any purpose +Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. diff --git a/src/android_dns.h b/src/android_dns.h index dafd8ec..0085af6 100644 --- a/src/android_dns.h +++ b/src/android_dns.h @@ -1,3 +1,18 @@ +/* + * Copyright (c) 2009 Marcel Bokhorst + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #ifndef __FIX_ANDROID_H__ #define __FIX_ANDROID_H__ diff --git a/src/base128.c b/src/base128.c index 7ddc38c..be7ba86 100644 --- a/src/base128.c +++ b/src/base128.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2009 J.A.Bezemer@opensourcepartners.nl * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/base128.h b/src/base128.h index 235b2f9..f4c55f6 100644 --- a/src/base128.h +++ b/src/base128.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2009 J.A.Bezemer@opensourcepartners.nl * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/base32.c b/src/base32.c index d971ce2..a058d38 100644 --- a/src/base32.c +++ b/src/base32.c @@ -3,7 +3,7 @@ * 2006-2009 Bjorn Andersson * Mostly rewritten 2009 J.A.Bezemer@opensourcepartners.nl * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/base32.h b/src/base32.h index 53975c5..83ba784 100644 --- a/src/base32.h +++ b/src/base32.h @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/base64.c b/src/base64.c index 71bbcf1..7834731 100644 --- a/src/base64.c +++ b/src/base64.c @@ -3,7 +3,7 @@ * 2006-2009 Bjorn Andersson * Mostly rewritten 2009 J.A.Bezemer@opensourcepartners.nl * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/base64.h b/src/base64.h index 662175e..8ce4742 100644 --- a/src/base64.h +++ b/src/base64.h @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/client.c b/src/client.c index c6236f6..b0bb68c 100644 --- a/src/client.c +++ b/src/client.c @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/client.h b/src/client.h index 983b830..c2493f1 100644 --- a/src/client.h +++ b/src/client.h @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/common.c b/src/common.c index 2715979..a7f4aa7 100644 --- a/src/common.c +++ b/src/common.c @@ -2,7 +2,7 @@ * 2006-2009 Bjorn Andersson * Copyright (c) 2007 Albert Lee . * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/common.h b/src/common.h index 3c98c01..4f51175 100644 --- a/src/common.h +++ b/src/common.h @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/dns.c b/src/dns.c index 0d3b8b3..5f187e4 100644 --- a/src/dns.c +++ b/src/dns.c @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/dns.h b/src/dns.h index 7c1faff..b5d83b2 100644 --- a/src/dns.h +++ b/src/dns.h @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/encoding.c b/src/encoding.c index af7620e..4906a6b 100644 --- a/src/encoding.c +++ b/src/encoding.c @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/encoding.h b/src/encoding.h index ab22279..abb82da 100644 --- a/src/encoding.h +++ b/src/encoding.h @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/fw_query.c b/src/fw_query.c index 4f7d8c4..873307a 100644 --- a/src/fw_query.c +++ b/src/fw_query.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2008-2014 Erik Ekman * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/fw_query.h b/src/fw_query.h index f8f0de6..0aa8778 100644 --- a/src/fw_query.h +++ b/src/fw_query.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2008-2014 Erik Ekman * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/iodine.c b/src/iodine.c index 75e9e50..2599a6d 100644 --- a/src/iodine.c +++ b/src/iodine.c @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/iodined.c b/src/iodined.c index 82a82eb..d7bf363 100644 --- a/src/iodined.c +++ b/src/iodined.c @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/login.c b/src/login.c index a809998..aa817c0 100644 --- a/src/login.c +++ b/src/login.c @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/login.h b/src/login.h index ebea25c..4d6d293 100644 --- a/src/login.h +++ b/src/login.h @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/read.c b/src/read.c index a2dcd96..2c26584 100644 --- a/src/read.c +++ b/src/read.c @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/read.h b/src/read.h index 2aac355..5da474d 100644 --- a/src/read.h +++ b/src/read.h @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/tun.c b/src/tun.c index c955b6d..1196ce2 100644 --- a/src/tun.c +++ b/src/tun.c @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/tun.h b/src/tun.h index 230484c..8982a9f 100644 --- a/src/tun.h +++ b/src/tun.h @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/user.c b/src/user.c index 0dc95db..61a16e8 100644 --- a/src/user.c +++ b/src/user.c @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/user.h b/src/user.h index 76fc54b..b5ccaa9 100644 --- a/src/user.h +++ b/src/user.h @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/util.c b/src/util.c index f4a538e..5cbad72 100644 --- a/src/util.c +++ b/src/util.c @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/util.h b/src/util.h index 6872077..a0ee03b 100644 --- a/src/util.h +++ b/src/util.h @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2006-2014 Erik Ekman , + * 2006-2009 Bjorn Andersson + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + #ifndef __UTIL_H__ #define __UTIL_H__ diff --git a/src/version.h b/src/version.h index 67b7c42..5843a7a 100644 --- a/src/version.h +++ b/src/version.h @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/src/windows.h b/src/windows.h index c665a60..96288d1 100644 --- a/src/windows.h +++ b/src/windows.h @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/tests/base32.c b/tests/base32.c index 419253f..4b460e2 100644 --- a/tests/base32.c +++ b/tests/base32.c @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/tests/base64.c b/tests/base64.c index cd96d21..bcefc4c 100644 --- a/tests/base64.c +++ b/tests/base64.c @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/tests/common.c b/tests/common.c index c1bc73f..742c04a 100644 --- a/tests/common.c +++ b/tests/common.c @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2006-2014 Erik Ekman , + * 2006-2009 Bjorn Andersson + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + #include #include #include diff --git a/tests/dns.c b/tests/dns.c index cdd3378..1f484ab 100644 --- a/tests/dns.c +++ b/tests/dns.c @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/tests/encoding.c b/tests/encoding.c index 665c4dd..0d5f358 100644 --- a/tests/encoding.c +++ b/tests/encoding.c @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/tests/fw_query.c b/tests/fw_query.c index c6ed2c7..be8ce10 100644 --- a/tests/fw_query.c +++ b/tests/fw_query.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2009-2014 Erik Ekman * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/tests/login.c b/tests/login.c index e154ee2..c814cee 100644 --- a/tests/login.c +++ b/tests/login.c @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/tests/read.c b/tests/read.c index 24a5214..764e635 100644 --- a/tests/read.c +++ b/tests/read.c @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/tests/test.c b/tests/test.c index cc753d4..eda792b 100644 --- a/tests/test.c +++ b/tests/test.c @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/tests/test.h b/tests/test.h index 511cf31..d3f7985 100644 --- a/tests/test.h +++ b/tests/test.h @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * diff --git a/tests/user.c b/tests/user.c index 2e4f36d..7d8804e 100644 --- a/tests/user.c +++ b/tests/user.c @@ -2,7 +2,7 @@ * Copyright (c) 2006-2014 Erik Ekman , * 2006-2009 Bjorn Andersson * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. *