[2/2] batctl: Merge batctl 2011.0.0

Message ID 1296330789-6561-2-git-send-email-sven@narfation.org (mailing list archive)
State Accepted, archived
Headers

Commit Message

Sven Eckelmann Jan. 29, 2011, 7:53 p.m. UTC
  Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batman/hash.c        |    2 +-
 batman/hash.h        |    2 +-
 batman/list-batman.c |    2 +-
 batman/list-batman.h |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
  

Patch

diff --git a/batman/hash.c b/batman/hash.c
index 1dccafa..e8c822f 100644
--- a/batman/hash.c
+++ b/batman/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/batman/hash.h b/batman/hash.h
index 56b5b1a..443ef28 100644
--- a/batman/hash.h
+++ b/batman/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/batman/list-batman.c b/batman/list-batman.c
index f521834..356c1eb 100644
--- a/batman/list-batman.c
+++ b/batman/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/batman/list-batman.h b/batman/list-batman.h
index cbacd7d..72d2ac4 100644
--- a/batman/list-batman.h
+++ b/batman/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
  *