[mlpack-git] master: Update license information to note other licenses. (ebf0dfc)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/20b4b2736cedb8c44c03e2af3f67f8a5af00927c...ebf0dfcf067b0f48ba11ac48e333875f7b4a1bce

>---------------------------------------------------------------

commit ebf0dfcf067b0f48ba11ac48e333875f7b4a1bce
Author: Ryan Curtin <ryan at ratml.org>
Date:   Mon Jun 20 09:25:00 2016 -0400

    Update license information to note other licenses.


>---------------------------------------------------------------

ebf0dfcf067b0f48ba11ac48e333875f7b4a1bce
 LICENSE.txt | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index f598996..027796c 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -2,8 +2,18 @@ mlpack is provided without any warranty of fitness for any purpose.  You
 can redistribute the library and/or modify it under the terms of the 3-clause
 BSD license.  The text of the 3-clause BSD license is contained below.
 
+mlpack contains some reproductions of the source code of Armadillo, which is
+licensed under the Mozilla Public License v2.0 (MPL2).  This code is found in
+src/mlpack/core/arma_extend/ and more details on the licensing are available
+there.
+
+mlpack also contains some reproductions of the source code of Boost, which is
+licensed under the Boost Software License, version 1.0.  This code is found in
+src/mlpack/core/boost_backport/ and more details on the licensing are available
+there.
+
 ----
-Copyright (c) 2007-2014, mlpack contributors (see COPYRIGHT.txt)
+Copyright (c) 2007-2016, mlpack contributors (see COPYRIGHT.txt)
 All rights reserved.
 
 Redistribution and use of mlpack in source and binary forms, with or without