[Bug 2397] License/copyright cleanup

bk: 51f4d357uIwG2wCDCeEh0MgygibMHQ

diff --git a/ChangeLog b/ChangeLog
index 4adb9a969beb423422552bd1aab418c8f076ef59..9b00a729649d77df23e89103147dbdb72b93ee41 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2397] License/copyright cleanup.
 * [Bug 2439] Fix check of EscapeCommFunction() in ports/winnt/libntp/termios.c.
 (4.2.7p376) 2013/07/24 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2322] Oncore driver should send 0 PPS offset to GPS.

diff --git a/include/timepps-SCO.h b/include/timepps-SCO.h
index 130a153c69f0b8b70ed95a8f11150821a781b55d..ce9052e2461eab303eef039cb1fb74ad0514f1b5 100644 (file)
--- a/include/timepps-SCO.h
+++ b/include/timepps-SCO.h
@@ -3,7 +3,7 @@
  * Copyright (c) David L. Mills 1999-2000                             *
  *                                                                    *
  * Permission to use, copy, modify, and distribute this software and   *
- * its documentation for any purpose and without fee is hereby        *
+ * its documentation for any purpose and with or without fee is hereby *
  * granted, provided that the above copyright notice appears in all    *
  * copies and that both the copyright notice and this permission       *
  * notice appear in supporting documentation, and that the name        *

diff --git a/include/timepps-Solaris.h b/include/timepps-Solaris.h
index 73faa5e087457b17d093a99307ce14614faa9bb3..a2b1fbe3b677b00dd5c835083ad98ab185027efc 100644 (file)
--- a/include/timepps-Solaris.h
+++ b/include/timepps-Solaris.h
@@ -3,7 +3,7 @@
  * Copyright (c) David L. Mills 1999-2009                             *
  *                                                                    *
  * Permission to use, copy, modify, and distribute this software and   *
- * its documentation for any purpose and without fee is hereby        *
+ * its documentation for any purpose and with or without fee is hereby *
  * granted, provided that the above copyright notice appears in all    *
  * copies and that both the copyright notice and this permission       *
  * notice appear in supporting documentation, and that the name        *

diff --git a/include/timepps-SunOS.h b/include/timepps-SunOS.h
index 6cd166e69c540ddbd3dc279b060651ef30cce3f9..4e4c05e0fee414d27ede9182be95b14fdee2a96b 100644 (file)
--- a/include/timepps-SunOS.h
+++ b/include/timepps-SunOS.h
@@ -3,7 +3,7 @@
  * Copyright (c) David L. Mills 1999-2000                             *
  *                                                                    *
  * Permission to use, copy, modify, and distribute this software and   *
- * its documentation for any purpose and without fee is hereby        *
+ * its documentation for any purpose and with or without fee is hereby *
  * granted, provided that the above copyright notice appears in all    *
  * copies and that both the copyright notice and this permission       *
  * notice appear in supporting documentation, and that the name        *

diff --git a/ports/winnt/include/timepps.h b/ports/winnt/include/timepps.h
index 40ac6877479e495d8b0473cb48d09663d2c0cbd6..76b1bfada1abfb76fc5b76b9ec4b8e74c7bdfc2c 100644 (file)
--- a/ports/winnt/include/timepps.h
+++ b/ports/winnt/include/timepps.h
@@ -3,7 +3,7 @@
  * Copyright (c) David L. Mills 1999-2009                             *
  *                                                                    *
  * Permission to use, copy, modify, and distribute this software and   *
- * its documentation for any purpose and without fee is hereby        *
+ * its documentation for any purpose and with or without fee is hereby *
  * granted, provided that the above copyright notice appears in all    *
  * copies and that both the copyright notice and this permission       *
  * notice appear in supporting documentation, and that the name        *

diff --git a/ports/winnt/ppsapi/loopback/monolithic-serialpps-timepps.h b/ports/winnt/ppsapi/loopback/monolithic-serialpps-timepps.h
index 62159fc98a844219842bc3c5e0b1e1f33c32f4ec..1007ccdd90c3b667aa063b604f8b32a4c4e9330b 100644 (file)
--- a/ports/winnt/ppsapi/loopback/monolithic-serialpps-timepps.h
+++ b/ports/winnt/ppsapi/loopback/monolithic-serialpps-timepps.h
@@ -3,7 +3,7 @@
  * Copyright (c) David L. Mills 1999-2000                             *
  *                                                                    *
  * Permission to use, copy, modify, and distribute this software and   *
- * its documentation for any purpose and without fee is hereby        *
+ * its documentation for any purpose and with or without fee is hereby *
  * granted, provided that the above copyright notice appears in all    *
  * copies and that both the copyright notice and this permission       *
  * notice appear in supporting documentation, and that the name        *

diff --git a/ports/winnt/ppsapi/loopback/monolithic-serialpps-timepps.txt b/ports/winnt/ppsapi/loopback/monolithic-serialpps-timepps.txt
index ce7786531a58bb3a1f063fe332d0a26f5b3da7d5..e335d4dfd9a17179cd3de343bb6fb16c3f3d4af1 100644 (file)
--- a/ports/winnt/ppsapi/loopback/monolithic-serialpps-timepps.txt
+++ b/ports/winnt/ppsapi/loopback/monolithic-serialpps-timepps.txt
@@ -3,7 +3,7 @@
  * Copyright (c) David L. Mills 1999-2000                             *
  *                                                                    *
  * Permission to use, copy, modify, and distribute this software and   *
- * its documentation for any purpose and without fee is hereby        *
+ * its documentation for any purpose and with or without fee is hereby *
  * granted, provided that the above copyright notice appears in all    *
  * copies and that both the copyright notice and this permission       *
  * notice appear in supporting documentation, and that the name        *

diff --git a/ports/winnt/ppsapi/loopback/src/timepps.h b/ports/winnt/ppsapi/loopback/src/timepps.h
index fb1f40c31ecff390772b94b9a19ba6b54e0f53d4..3a7e80662418c283a1892458b2587484e62f7454 100644 (file)
--- a/ports/winnt/ppsapi/loopback/src/timepps.h
+++ b/ports/winnt/ppsapi/loopback/src/timepps.h
@@ -3,7 +3,7 @@
  * Copyright (c) David L. Mills 1999-2009                             *
  *                                                                    *
  * Permission to use, copy, modify, and distribute this software and   *
- * its documentation for any purpose and without fee is hereby        *
+ * its documentation for any purpose and with or without fee is hereby *
  * granted, provided that the above copyright notice appears in all    *
  * copies and that both the copyright notice and this permission       *
  * notice appear in supporting documentation, and that the name        *