The following commit has been merged in the master branch: commit 73ad7ed08fa18817895ed674277702cff09494d5 Author: Sven Eckelmann sven@narfation.org Date: Sun Jan 1 00:41:40 2012 +0100

vis: Update copyright years

Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Elektra Wagenrad onelektra@gmx.net

diff --git a/Makefile b/Makefile index 1804155..c4220f5 100755 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ #!/usr/bin/make -f # -*- makefile -*- # -# Copyright (C) 2006-2009 BATMAN contributors +# Copyright (C) 2006-2012 BATMAN contributors # # 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/allocate.c b/allocate.c index 56f495f..5077531 100644 --- a/allocate.c +++ b/allocate.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: * * Thomas Lopatic, Corinna 'Elektra' Aichele, Axel Neumann, Marek Lindner * diff --git a/allocate.h b/allocate.h index c3fe7df..167ab33 100644 --- a/allocate.h +++ b/allocate.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: * * Thomas Lopatic, Corinna 'Elektra' Aichele, Axel Neumann, Marek Lindner * diff --git a/hash.c b/hash.c index e8c822f..2a9f557 100644 --- a/hash.c +++ b/hash.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/hash.h b/hash.h index 443ef28..91ee7d8 100644 --- a/hash.h +++ b/hash.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/list-batman.c b/list-batman.c index 356c1eb..a0c2ad8 100644 --- a/list-batman.c +++ b/list-batman.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/list-batman.h b/list-batman.h index 72d2ac4..ebff97c 100644 --- a/list-batman.h +++ b/list-batman.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/udp_server.c b/udp_server.c index 8f9e664..1df497c 100644 --- a/udp_server.c +++ b/udp_server.c @@ -1,7 +1,7 @@ /* * udp_server.c * - * Copyright (C) 2006-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/vis-types.h b/vis-types.h index a4a35b2..c4c8068 100644 --- a/vis-types.h +++ b/vis-types.h @@ -1,7 +1,7 @@ /* * vis-types.h * - * Copyright (C) 2006-2009 Marek Lindner: + * Copyright (C) 2006-2012 Marek Lindner: * * * This program is free software; you can redistribute it and/or diff --git a/vis.c b/vis.c index 039bfa0..d92fbe8 100644 --- a/vis.c +++ b/vis.c @@ -1,7 +1,7 @@ /* * vis.c * - * Copyright (C) 2006-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: * * Andreas Langer an.langer@gmx.de, Marek Lindner * diff --git a/vis.h b/vis.h index 74a3bd8..76ffdfb 100644 --- a/vis.h +++ b/vis.h @@ -1,7 +1,7 @@ /* * vis.h * - * Copyright (C) 2006-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: * * Andreas Langer an.langer@gmx.de, Marek Lindner *