From e7d57136ef1054fce8593b35684b0ea6245089f2 Mon Sep 17 00:00:00 2001 From: historic_bruno Date: Sun, 15 Dec 2013 02:49:11 +0000 Subject: [PATCH] Updates license files for gloox, MiniUPnPc, and pkcs5_pbkdf2. Refs #2308 This was SVN commit r14357. --- LICENSE.txt | 3 +++ libraries/LICENSE.txt | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 0206da2511..e976731c7e 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -51,6 +51,9 @@ in particular, let us know and we can try to clarify it. /source/lib MIT + /source/lobby/pkcs5_pbkdf2.cpp + ISC + /source/third_party/mikktspace zlib diff --git a/libraries/LICENSE.txt b/libraries/LICENSE.txt index 58654d23d6..e96f06f4d8 100644 --- a/libraries/LICENSE.txt +++ b/libraries/LICENSE.txt @@ -17,6 +17,9 @@ win32/ contains headers and precompiled static libs for Windows builds. source/fcollada MIT (see src/FCollada/Copyright.txt) + source/miniupnpc + BSD + source/nvtt MIT (see src/NVIDIA_Texture_Tools_LICENSE.txt) @@ -29,8 +32,8 @@ win32/ contains headers and precompiled static libs for Windows builds. win32/boost Boost Software License - win32/cryptopp - Crypto++ License (files are public domain) + win32/gloox + GPL v2 win32/libcurl MIT