summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Kreen2009-04-08 15:31:41 +0000
committerMarko Kreen2009-04-08 16:43:34 +0000
commit16b6961cef3d35286b4f8b50c0cf3bdee2881145 (patch)
treeebfe85830d191e9625061048e1cb2910fc52b432
parentb464dd9ef22e90e4c4da109227906d0ea38342f2 (diff)
Apply ISC license clarification
for f in `grep -rl 'and distribute' .`; do echo -e "%s;and distribute;and/or distribute;\nwq" | ed "$f"; done More at: http://en.wikipedia.org/wiki/ISC_licence
-rw-r--r--COPYRIGHT2
-rw-r--r--sql/pgq/lowlevel/insert_event.c2
-rw-r--r--sql/pgq/triggers/common.c2
-rw-r--r--sql/pgq/triggers/logtriga.c2
-rw-r--r--sql/pgq/triggers/logutriga.c2
-rw-r--r--sql/pgq/triggers/makesql.c2
-rw-r--r--sql/pgq/triggers/sqltriga.c2
-rw-r--r--sql/pgq/triggers/stringutil.c2
8 files changed, 8 insertions, 8 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index c20f0b8b..740a5aea 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -2,7 +2,7 @@ SkyTools - tool collection for PostgreSQL
Copyright (c) 2007 Marko Kreen, Skype Technologies OÜ
-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/sql/pgq/lowlevel/insert_event.c b/sql/pgq/lowlevel/insert_event.c
index e55a18a6..3ac283e7 100644
--- a/sql/pgq/lowlevel/insert_event.c
+++ b/sql/pgq/lowlevel/insert_event.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2007 Marko Kreen, Skype Technologies OÜ
*
- * 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/sql/pgq/triggers/common.c b/sql/pgq/triggers/common.c
index 883bbfa5..880681b5 100644
--- a/sql/pgq/triggers/common.c
+++ b/sql/pgq/triggers/common.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2007 Marko Kreen, Skype Technologies OÜ
*
- * 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/sql/pgq/triggers/logtriga.c b/sql/pgq/triggers/logtriga.c
index 0b2e544b..4fe38c21 100644
--- a/sql/pgq/triggers/logtriga.c
+++ b/sql/pgq/triggers/logtriga.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2007 Marko Kreen, Skype Technologies OÜ
*
- * 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/sql/pgq/triggers/logutriga.c b/sql/pgq/triggers/logutriga.c
index 37506aa7..35031274 100644
--- a/sql/pgq/triggers/logutriga.c
+++ b/sql/pgq/triggers/logutriga.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2007 Marko Kreen, Skype Technologies OÜ
*
- * 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/sql/pgq/triggers/makesql.c b/sql/pgq/triggers/makesql.c
index e9b1ca85..53f5ef86 100644
--- a/sql/pgq/triggers/makesql.c
+++ b/sql/pgq/triggers/makesql.c
@@ -8,7 +8,7 @@
* Copyright (c) 2003-2006, PostgreSQL Global Development Group
* Author: Jan Wieck, Afilias USA INC.
*
- * 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/sql/pgq/triggers/sqltriga.c b/sql/pgq/triggers/sqltriga.c
index 3ccfb50a..00f545f8 100644
--- a/sql/pgq/triggers/sqltriga.c
+++ b/sql/pgq/triggers/sqltriga.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2007 Marko Kreen, Skype Technologies OÜ
*
- * 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/sql/pgq/triggers/stringutil.c b/sql/pgq/triggers/stringutil.c
index ebd5b098..230567bc 100644
--- a/sql/pgq/triggers/stringutil.c
+++ b/sql/pgq/triggers/stringutil.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2007 Marko Kreen, Skype Technologies OÜ
*
- * 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.
*