X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fptimer.c;h=4a6c89fb1c56f31ed5523f8e9ce3086c0fb4c684;hp=bce8a3e5ffe5f1448510762e3829c8e2d2b3b56a;hb=462e643a7e31676eceda23e634241f7b4d2cd7bb;hpb=84ebc1e5d5c13a817b6ab6b4b8580e6922a3b772 diff --git a/src/ptimer.c b/src/ptimer.c index bce8a3e5..4a6c89fb 100644 --- a/src/ptimer.c +++ b/src/ptimer.c @@ -16,15 +16,16 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Wget. If not, see . -In addition, as a special exception, the Free Software Foundation -gives permission to link the code of its release of Wget with the -OpenSSL project's "OpenSSL" library (or with modified versions of it -that use the same license as the "OpenSSL" library), and distribute -the linked executables. You must obey the GNU General Public License -in all respects for all of the code used other than "OpenSSL". If you -modify this file, you may extend this exception to your version of the -file, but you are not obligated to do so. If you do not wish to do -so, delete this exception statement from your version. */ +Additional permission under GNU GPL version 3 section 7 + +If you modify this program, or any covered work, by linking or +combining it with the OpenSSL project's OpenSSL library (or a +modified version of that library), containing parts covered by the +terms of the OpenSSL or SSLeay licenses, the Free Software Foundation +grants you additional permission to convey the resulting work. +Corresponding Source for a non-source form of such a combination +shall include the source code for the parts of OpenSSL used as well +as that of the covered work. */ /* This file implements "portable timers" (ptimers), objects that measure elapsed time using the primitives most appropriate for the