The following commit has been merged in the master branch: commit cf6ef953809eb59dd17c0013e34dba0682dea189 Author: Sven Eckelmann sven@narfation.org Date: Sat Jan 29 20:03:49 2011 +0100
batctl: Merge batctl 2011.0.0
Signed-off-by: Sven Eckelmann sven@narfation.org
diff --git a/hash.c b/hash.c index 1dccafa..e8c822f 100644 --- a/hash.c +++ b/hash.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2010 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/hash.h b/hash.h index 56b5b1a..443ef28 100644 --- a/hash.h +++ b/hash.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2010 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/list-batman.c b/list-batman.c index f521834..356c1eb 100644 --- a/list-batman.c +++ b/list-batman.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2010 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/list-batman.h b/list-batman.h index cbacd7d..72d2ac4 100644 --- a/list-batman.h +++ b/list-batman.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2010 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors: * * Marek Lindner *