summaryrefslogtreecommitdiff
path: root/LICENCE
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2012-05-17 13:04:02 +0100
committerColin Watson <cjwatson@debian.org>2012-05-17 13:04:02 +0100
commitdd5ed53e20d218607260916a6b04d1c8c5b3d88f (patch)
treec59b4dbcc610f10700945f885adf3bddc2542c26 /LICENCE
parent8241a65bf12ac53c1b7304bba7ce739aad80b8b8 (diff)
parentb9bc38990c5eb5d99e28ca5af6d3491fd4a0060a (diff)
merge 6.0p1
Diffstat (limited to 'LICENCE')
-rw-r--r--LICENCE1
1 files changed, 1 insertions, 0 deletions
diff --git a/LICENCE b/LICENCE
index 120d6fd54..f52387139 100644
--- a/LICENCE
+++ b/LICENCE
@@ -207,6 +207,7 @@ OpenSSH contains no GPL code.
207 The SCO Group 207 The SCO Group
208 Daniel Walsh 208 Daniel Walsh
209 Red Hat, Inc 209 Red Hat, Inc
210 Simon Vallet / Genoscope
210 211
211 * Redistribution and use in source and binary forms, with or without 212 * Redistribution and use in source and binary forms, with or without
212 * modification, are permitted provided that the following conditions 213 * modification, are permitted provided that the following conditions