summaryrefslogtreecommitdiff
path: root/debian/copyright
diff options
context:
space:
mode:
authorDave Olson <olson@cumulusnetworks.com>2017-05-23 17:16:10 -0700
committerDave Olson <olson@cumulusnetworks.com>2017-05-23 17:16:10 -0700
commit957489a8455daa69d03fdfef7d3f4c19b1499157 (patch)
tree7064198f039e24912c0fa573c12174861eb476b3 /debian/copyright
parentcc571f7356bb42c5360e0e40b786b5c9b75c3d95 (diff)
parent9b056a2a66ec7006d86121509ef1049c7f6f0725 (diff)
downloadlibnss-tacplus-957489a8455daa69d03fdfef7d3f4c19b1499157.tar.gz
libnss-tacplus-957489a8455daa69d03fdfef7d3f4c19b1499157.zip
Merge with ongoing development
Conflicts (whitespace): debian/copyright nss_tacplus.c
Diffstat (limited to 'debian/copyright')
-rw-r--r--debian/copyright5
1 files changed, 3 insertions, 2 deletions
diff --git a/debian/copyright b/debian/copyright
index 9b1b34a..710851e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,8 +3,9 @@ Upstream-Name: libnss-tacplus
Source: http://www.cumulusnetworks.com
Files: *
-Copyright: 2015, 2016 Cumulus Networks, Inc. All rights reserved.,
- 2010 Pawel Krawczyk <pawel.krawczyk@hush.com> and Jeroen Nijhof <jeroen@jeroennijhof.nl>
+Copyright: 2015, 2016, 2017 Cumulus Networks, Inc. All rights reserved.,
+ 2010 Pawel Krawczyk <pawel.krawczyk@hush.com> and
+ Jeroen Nijhof <jeroen@jeroennijhof.nl>
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by