The following commit has been merged in the master branch: commit 86bd87d114102e992cd5e7b940059b2645124e56 Author: Marek Lindner lindner_marek@yahoo.de Date: Sat Sep 18 11:22:50 2010 +0200

batctl: change email

Signed-off-by: Andreas Langer <an.langer at gmx.de>

diff --git a/bat-hosts.c b/bat-hosts.c index 5802e80..888b997 100644 --- a/bat-hosts.c +++ b/bat-hosts.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * - * Andreas Langer a.langer@q-dsl.de, Marek Lindner lindner_marek@yahoo.de + * Andreas Langer an.langer@gmx.de, Marek Lindner lindner_marek@yahoo.de * * 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/functions.c b/functions.c index 497e166..cff8b52 100644 --- a/functions.c +++ b/functions.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * - * Andreas Langer a.langer@q-dsl.de, Marek Lindner lindner_marek@yahoo.de + * Andreas Langer an.langer@gmx.de, Marek Lindner lindner_marek@yahoo.de * * 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/functions.h b/functions.h index 6aa9487..1b1c350 100644 --- a/functions.h +++ b/functions.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * - * Andreas Langer a.langer@q-dsl.de, Marek Lindner lindner_marek@yahoo.de + * Andreas Langer an.langer@gmx.de, Marek Lindner lindner_marek@yahoo.de * * 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/main.h b/main.h index 793d282..8689d67 100644 --- a/main.h +++ b/main.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * - * Andreas Langer a.langer@q-dsl.de, Marek Lindner lindner_marek@yahoo.de + * Andreas Langer an.langer@gmx.de, Marek Lindner lindner_marek@yahoo.de * * 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/man/batctl.8 b/man/batctl.8 index 4ffb412..f98e6ad 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -201,7 +201,7 @@ remember than MAC addresses. .BR dmesg (1), .BR dot (1) .SH AUTHOR -batctl was written by Andreas Langer a.langer@q-dsl.de and Marek +batctl was written by Andreas Langer an.langer@gmx.de and Marek Lindner lindner_marek@yahoo.de. .PP This manual page was written by Simon Wunderlich diff --git a/ping.c b/ping.c index affd6ad..288bd01 100644 --- a/ping.c +++ b/ping.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * - * Andreas Langer a.langer@q-dsl.de, Marek Lindner lindner_marek@yahoo.de + * Andreas Langer an.langer@gmx.de, Marek Lindner lindner_marek@yahoo.de * * 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/tcpdump.c b/tcpdump.c index 6994b1e..0f62e65 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * - * Andreas Langer a.langer@q-dsl.de + * Andreas Langer an.langer@gmx.de * * 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/tcpdump.h b/tcpdump.h index 19b0585..f98d63f 100644 --- a/tcpdump.h +++ b/tcpdump.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * - * Andreas Langer a.langer@q-dsl.de, Marek Lindner lindner_marek@yahoo.de + * Andreas Langer an.langer@gmx.de, Marek Lindner lindner_marek@yahoo.de * * 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/traceroute.c b/traceroute.c index 63de7e6..dc97a01 100644 --- a/traceroute.c +++ b/traceroute.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * - * Andreas Langer a.langer@q-dsl.de, Marek Lindner lindner_marek@yahoo.de + * Andreas Langer an.langer@gmx.de, Marek Lindner lindner_marek@yahoo.de * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public