From: Florian Forster <octo@verplant.org>
Date: Fri, 7 Jul 2006 09:32:48 +0000 (+0200)
Subject: Merge branch 'origin'
X-Git-Tag: liboping-0.3.0~3
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=33a84dc3dca4be5fe92061153277eb5df8a54e7f;hp=307943f23d8bc461148f33ece340a0f1bb141c80;p=liboping.git

Merge branch 'origin'
---

diff --git a/src/liboping.c b/src/liboping.c
index 21855e1..0dc956e 100644
--- a/src/liboping.c
+++ b/src/liboping.c
@@ -4,8 +4,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; only version 2 of the License is
+ * applicable.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/oping.c b/src/oping.c
index 63de917..d4469a8 100644
--- a/src/oping.c
+++ b/src/oping.c
@@ -4,8 +4,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; only version 2 of the License is
+ * applicable.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/oping.h b/src/oping.h
index 4cdb3cf..061aa5d 100644
--- a/src/oping.h
+++ b/src/oping.h
@@ -4,8 +4,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; only version 2 of the License is
+ * applicable.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of