diff options
author | Greg Hudson <ghudson@mit.edu> | 2010-10-02 17:21:54 +0000 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2010-10-02 17:21:54 +0000 |
commit | 23f90e6bf3c7888ffbd59935ced87156d0be5a53 (patch) | |
tree | fefdfab6da9cc964de26d5915140aefe53103529 /NOTICE | |
parent | 1827e342c54b79566e6270f764e14e01990633ab (diff) | |
download | krb5-23f90e6bf3c7888ffbd59935ced87156d0be5a53.zip krb5-23f90e6bf3c7888ffbd59935ced87156d0be5a53.tar.gz krb5-23f90e6bf3c7888ffbd59935ced87156d0be5a53.tar.bz2 |
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-- | NOTICE | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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 |