From 3c04cdb8e03ebccac28da37b65a14891bec33dac Mon Sep 17 00:00:00 2001 From: historic_bruno Date: Sat, 18 Jan 2014 23:41:27 +0000 Subject: [PATCH] Updates LICENSE.txt for 29a8df5029, refs #2308. Sets svn:ignore property on generated cpp from encryption tests. This was SVN commit r14617. --- LICENSE.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index e976731c7e..85d63c8e8e 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -51,8 +51,10 @@ in particular, let us know and we can try to clarify it. /source/lib MIT - /source/lobby/pkcs5_pbkdf2.cpp - ISC + /source/third_party/encryption + GPL version 2 (or later) + ISC (pkcs5_pbkdf2.cpp) + MIT (pkcs5_pbkdf2.h) /source/third_party/mikktspace zlib