The following commit has been merged in the master branch: commit 35c133a000d54b7e3fe81e8c8e4b8af5878ad6dd Author: Antonio Quartulli ordex@autistici.org Date: Wed Mar 14 13:03:01 2012 +0100

batman-adv: add contributor name

translation_table.{c,h} have been heavily modified by another contributor and for legal purposes it is better to include his name into the contributor list

Signed-off-by: Antonio Quartulli ordex@autistici.org

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index a38d315..2cb46f0 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * - * Marek Lindner, Simon Wunderlich + * Marek Lindner, Simon Wunderlich, Antonio Quartulli * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public diff --git a/net/batman-adv/translation-table.h b/net/batman-adv/translation-table.h index bfebe26..593d1b3 100644 --- a/net/batman-adv/translation-table.h +++ b/net/batman-adv/translation-table.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * - * Marek Lindner, Simon Wunderlich + * Marek Lindner, Simon Wunderlich, Antonio Quartulli * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public