The following commit has been merged in the master branch: commit 66f2c7c17caadbde4b9a8db3624af0002a43d806 Author: Antonio Quartulli ordex@autistici.org Date: Wed Mar 14 12:57:02 2012 +0100

batman-adv: update copyright years

update copyright years in order to include 2012

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

diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 23bfbed..8a17a78 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2011-2012 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/bridge_loop_avoidance.h b/bridge_loop_avoidance.h index 2758b8c..e1a2966 100644 --- a/bridge_loop_avoidance.h +++ b/bridge_loop_avoidance.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2011-2012 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/distributed-arp-table.c b/distributed-arp-table.c index c610108..b43bece 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2011-2012 B.A.T.M.A.N. contributors: * * Antonio Quartulli * diff --git a/distributed-arp-table.h b/distributed-arp-table.h index 0916661..26b98c0 100644 --- a/distributed-arp-table.h +++ b/distributed-arp-table.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2011-2012 B.A.T.M.A.N. contributors: * * Antonio Quartulli *