[mlpack-git] mlpack-2.x: Update license information to note other licenses. (078c444)

gitdub at mlpack.org gitdub at mlpack.org
Mon Jun 20 09:25:00 EDT 2016


Repository : https://github.com/mlpack/mlpack
On branch  : mlpack-2.x
Link       : https://github.com/mlpack/mlpack/compare/6b841d9dbc61606fe515bdafb102b9759b8a3284...078c44413a9f1393e1d2be6e0fe711eb62034f3a

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

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

    Update license information to note other licenses.


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

078c44413a9f1393e1d2be6e0fe711eb62034f3a
 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




More information about the mlpack-git mailing list