diff options
| author | Marius Halden <marius.h@lden.org> | 2017-04-07 10:24:13 +0200 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2017-04-07 10:24:13 +0200 |
| commit | dd46ae5bef1c34773a3e7d3e2ef48fc013cef283 (patch) | |
| tree | decbedfb7b847c01493dc95890f2169b4b0e31f3 /debian | |
| parent | febcb6dca01bb17e0197770a0e6596aaa98bcdbd (diff) | |
| parent | 051506399e1455d88f6179010129308c754be936 (diff) | |
Merge branch 'master' into patched-master
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/copyright | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/copyright b/debian/copyright index c5ca4e16..09f27568 100644 --- a/debian/copyright +++ b/debian/copyright @@ -16,6 +16,8 @@ Bits of third party code, also (L)GPLed: Other license (but GPL-compatible): * lib/json.[ch] is from <https://github.com/udp/json-parser> and licensed under the modified BSD license. +* lib/canohost.[ch] is from OpenSSH and licenced under the BSD-3-clause + licence. BitlBee License: |