From bfcaffaab611b2f8ea4c9fe70d69e7096975a009 Mon Sep 17 00:00:00 2001 From: Jakub Slawinski Date: Thu, 10 Jul 2014 15:13:43 +0200 Subject: Revert "Used LICENSE file instead of COPYING." This reverts commit 58f81d19ce809fac5d0a0fbe7b682243ada86aea. Conflicts: README.md --- Makefile.in | 2 +- README | 2 +- README.md | 2 +- doc/afclient.1 | 2 +- doc/afclient.conf.5 | 2 +- doc/afserver.1 | 2 +- doc/afserver.conf.5 | 2 +- doc/en/README | 2 +- doc/fr/fr_README | 2 +- doc/ru/ru_README | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile.in b/Makefile.in index fbdea76..7de0b0f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -36,7 +36,7 @@ POST_UNINSTALL = : subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure AUTHORS LICENSE ChangeLog INSTALL NEWS \ + $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ depcomp install-sh missing mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac diff --git a/README b/README index 2e853be..e9f5b20 100644 --- a/README +++ b/README @@ -677,7 +677,7 @@ LICENSE Active Port Forwarder is distributed under the terms of the GNU General Public License v2.0 and is copyright (C) 2003-2007 jeremian . See the file LICENSE for details. + [at] poczta.fm>. See the file COPYING for details. In addition, as a special exception, the copyright holders give permission to link the code of portions of this program with the OpenSSL library under diff --git a/README.md b/README.md index 0f1ad44..1e082e4 100644 --- a/README.md +++ b/README.md @@ -656,7 +656,7 @@ LICENSE Active Port Forwarder is distributed under the terms of the GNU General Public License v2.0 and is copyright (C) 2003-2007 jeremian . See the file LICENSE for details. + [at] poczta.fm>. See the file COPYING for details. In addition, as a special exception, the copyright holders give permission to link the code of portions of this program with the OpenSSL library under diff --git a/doc/afclient.1 b/doc/afclient.1 index ccfb3b8..677ec7a 100644 --- a/doc/afclient.1 +++ b/doc/afclient.1 @@ -341,4 +341,4 @@ Alex Dyatlov , Simon , I .SH LICENSE -Active Port Forwarder is distributed under the terms of the GNU General Public License v2.0 and is copyright (C) 2003-2007 jeremian . See the file LICENSE for details. +Active Port Forwarder is distributed under the terms of the GNU General Public License v2.0 and is copyright (C) 2003-2007 jeremian . See the file COPYING for details. diff --git a/doc/afclient.conf.5 b/doc/afclient.conf.5 index 42f2a18..4f8a5c6 100644 --- a/doc/afclient.conf.5 +++ b/doc/afclient.conf.5 @@ -149,4 +149,4 @@ Alex Dyatlov , Simon , I .SH LICENSE -Active Port Forwarder is distributed under the terms of the GNU General Public License v2.0 and is copyright (C) 2003-2007 jeremian . See the file LICENSE for details. +Active Port Forwarder is distributed under the terms of the GNU General Public License v2.0 and is copyright (C) 2003-2007 jeremian . See the file COPYING for details. diff --git a/doc/afserver.1 b/doc/afserver.1 index 0830d8a..887d79b 100644 --- a/doc/afserver.1 +++ b/doc/afserver.1 @@ -246,4 +246,4 @@ Alex Dyatlov , Simon , I .SH LICENSE -Active Port Forwarder is distributed under the terms of the GNU General Public License v2.0 and is copyright (C) 2003-2007 jeremian . See the file LICENSE for details. +Active Port Forwarder is distributed under the terms of the GNU General Public License v2.0 and is copyright (C) 2003-2007 jeremian . See the file COPYING for details. diff --git a/doc/afserver.conf.5 b/doc/afserver.conf.5 index 80c0776..c62e105 100644 --- a/doc/afserver.conf.5 +++ b/doc/afserver.conf.5 @@ -135,4 +135,4 @@ Alex Dyatlov , Simon , I .SH LICENSE -Active Port Forwarder is distributed under the terms of the GNU General Public License v2.0 and is copyright (C) 2003-2007 jeremian . See the file LICENSE for details. +Active Port Forwarder is distributed under the terms of the GNU General Public License v2.0 and is copyright (C) 2003-2007 jeremian . See the file COPYING for details. diff --git a/doc/en/README b/doc/en/README index 2e853be..e9f5b20 100644 --- a/doc/en/README +++ b/doc/en/README @@ -677,7 +677,7 @@ LICENSE Active Port Forwarder is distributed under the terms of the GNU General Public License v2.0 and is copyright (C) 2003-2007 jeremian . See the file LICENSE for details. + [at] poczta.fm>. See the file COPYING for details. In addition, as a special exception, the copyright holders give permission to link the code of portions of this program with the OpenSSL library under diff --git a/doc/fr/fr_README b/doc/fr/fr_README index 46c0c89..1366291 100644 --- a/doc/fr/fr_README +++ b/doc/fr/fr_README @@ -485,4 +485,4 @@ LICENCE Active Port Forwarder est distribué sous les termes de la licence GNU - General Public Licence version 2.0 et est copyright (c)2003,2004,2005 jeremian . - Consultez le fichier LICENSE pour plus de details. + Consultez le fichier COPYING pour plus de details. diff --git a/doc/ru/ru_README b/doc/ru/ru_README index a3a0429..4e825f7 100644 --- a/doc/ru/ru_README +++ b/doc/ru/ru_README @@ -291,4 +291,4 @@ http://gray-world.net/board/ Active Port Forwarder is distributed under the terms of the GNU General Public License v2.0 and is copyright (c) 2003,2004 jeremian . See the file LICENSE for details. + poczta.fm>. See the file COPYING for details. -- cgit v1.1