diff options
| author | Linus Nordberg <linus@nordu.net> | 2012-09-14 10:32:53 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2012-10-30 11:43:42 +0100 |
| commit | 8c8a1423c3d407bd119b75aae93386bbfd0176e2 (patch) | |
| tree | 32cf819602b0d3da5ba0bcb0758a88636b16a2e5 /tlv11.c | |
| parent | 7c623adb88bca75fbdac6b6d34bfa069a58ee696 (diff) | |
| parent | 9142e68885bb6d19f0f6d44c4d8daf5ae4d12cbe (diff) | |
Merge branch 'licensing-nogpl'
Conflicts:
configure.ac
Diffstat (limited to 'tlv11.c')
| -rw-r--r-- | tlv11.c | 11 |
1 files changed, 3 insertions, 8 deletions
@@ -1,11 +1,6 @@ -/* - * Copyright (C) 2008 Stig Venaas <venaas@uninett.no> - * Copyright (C) 2010 NORDUnet A/S - * - * 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-2010, UNINETT AS + * Copyright (c) 2010-2012, NORDUnet A/S */ +/* See LICENSE for licensing information. */ #ifdef SYS_SOLARIS9 #include <sys/inttypes.h> |