From 1c2cd7ed273ee1538ff8a13d036c68aa9992c4aa Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Fri, 22 Oct 2010 13:17:42 +0200 Subject: [PATCH 1/1] Attribution for Julien Muchembled. --- AUTHORS | 1 + THANKS | 1 + src/conf.c | 3 ++- src/tincd.c | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 7c20a8df..cd409485 100644 --- a/AUTHORS +++ b/AUTHORS @@ -8,6 +8,7 @@ Significant contributions from: - Grzegorz Dymarek - Max Rijevski - Scott Lamb +- Julien Muchembled These files are from other sources: * lib/pidfile.h and lib/pidfile.c are by Martin Schulze, taken from diff --git a/THANKS b/THANKS index 08f17d58..601116ef 100644 --- a/THANKS +++ b/THANKS @@ -17,6 +17,7 @@ We would like to thank the following people for their contributions to tinc: * Jason Harper * Jeroen Ubbink * Jerome Etienne +* Julien Muchembled * Lubomír Bulej * Mads Kiilerich * Marc A. Lehmann diff --git a/src/conf.c b/src/conf.c index da58a455..f5f6c3a4 100644 --- a/src/conf.c +++ b/src/conf.c @@ -2,7 +2,8 @@ conf.c -- configuration code Copyright (C) 1998 Robert van der Meulen 1998-2005 Ivo Timmermans - 2000-2009 Guus Sliepen + 2000-2010 Guus Sliepen + 2010 Julien Muchembled 2000 Cris van Pelt This program is free software; you can redistribute it and/or modify diff --git a/src/tincd.c b/src/tincd.c index dc9bf469..89e0c934 100644 --- a/src/tincd.c +++ b/src/tincd.c @@ -4,6 +4,7 @@ 2000-2010 Guus Sliepen 2008 Max Rijevski 2009 Michael Tokarev + 2010 Julien Muchembled 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 -- 2.20.1