summaryrefslogtreecommitdiffstats
path: root/NOTICE
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2010-10-02 17:21:54 +0000
committerGreg Hudson <ghudson@mit.edu>2010-10-02 17:21:54 +0000
commit23f90e6bf3c7888ffbd59935ced87156d0be5a53 (patch)
treefefdfab6da9cc964de26d5915140aefe53103529 /NOTICE
parent1827e342c54b79566e6270f764e14e01990633ab (diff)
downloadkrb5-23f90e6bf3c7888ffbd59935ced87156d0be5a53.tar.gz
krb5-23f90e6bf3c7888ffbd59935ced87156d0be5a53.tar.xz
krb5-23f90e6bf3c7888ffbd59935ced87156d0be5a53.zip
Merge branches/nss to trunk
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24416 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'NOTICE')
-rw-r--r--NOTICE3
1 files changed, 2 insertions, 1 deletions
diff --git a/NOTICE b/NOTICE
index e52ca35574..6124137387 100644
--- a/NOTICE
+++ b/NOTICE
@@ -173,7 +173,8 @@ src/lib/crypto/aes has the following copyright:
--------------------
Portions contributed by Red Hat, including the pre-authentication
-plug-ins framework, contain the following copyright:
+plug-ins framework and the NSS crypto implementation, contain the
+following copyright:
Copyright (c) 2006 Red Hat, Inc.
Portions copyright (c) 2006 Massachusetts Institute of Technology