From bd942add4b203e9876dc1b8a2f9ae18413a54a20 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Fri, 14 Sep 2012 11:11:19 +0200
Subject: Update copyright and licensing information.

Note that this change makes all files carry the same copyright info,
regardless of when they've been touched. People interested in more
detail will have to consult the commit history.
---
 udp.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'udp.c')

diff --git a/udp.c b/udp.c
index c804703..a6b8bc2 100644
--- a/udp.c
+++ b/udp.c
@@ -1,10 +1,7 @@
-/*
- * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
 
 #include <signal.h>
 #include <sys/socket.h>
-- 
cgit v1.1


From 8d3d567f3b3e0b7f56cce1d878d34768ee86b3c0 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Mon, 17 Sep 2012 09:49:39 +0200
Subject: Remove Stig from first copyright line.

---
 udp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'udp.c')

diff --git a/udp.c b/udp.c
index a6b8bc2..4bc85f1 100644
--- a/udp.c
+++ b/udp.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+/* Copyright (c) 2006-2010, UNINETT AS.
  * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
-- 
cgit v1.1


From 1c6043308251a2884892cfc726dde45ab115d326 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Mon, 17 Sep 2012 09:56:38 +0200
Subject: Remove the second copyright line, with both UNINETT and NORDUnet.

The overlap is clearly expressed without it.
---
 udp.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'udp.c')

diff --git a/udp.c b/udp.c
index 4bc85f1..0942c0c 100644
--- a/udp.c
+++ b/udp.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
-- 
cgit v1.1


From 9142e68885bb6d19f0f6d44c4d8daf5ae4d12cbe Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Tue, 25 Sep 2012 13:41:08 +0200
Subject: Formatting changes.

And, actually, a typo in catgconf.c.

Cherry-picked b712a6bf from branch 'licensing'.
Conflicts:

	LICENSE
---
 udp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'udp.c')

diff --git a/udp.c b/udp.c
index 0942c0c..352b2f9 100644
--- a/udp.c
+++ b/udp.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <signal.h>
-- 
cgit v1.1