You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by GitBox <gi...@apache.org> on 2018/04/02 23:20:16 UTC

[GitHub] eric-haibin-lin closed pull request #10373: Adding a BSD file to LICENSE

eric-haibin-lin closed pull request #10373: Adding a BSD file to LICENSE
URL: https://github.com/apache/incubator-mxnet/pull/10373
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/LICENSE b/LICENSE
index b783e3ce3ca..b79a3c548ac 100644
--- a/LICENSE
+++ b/LICENSE
@@ -395,7 +395,7 @@
     =======================================================================================
 
     4. FindCrypto.cmake
-    For details, see, dmlc-core/cmake/Modules/FindCrypto.cmake,
+    For details, see, 3rdparty/dmlc-core/cmake/Modules/FindCrypto.cmake,
     Redistribution and use is allowed according to the terms of the BSD license.
 
     =======================================================================================
@@ -497,15 +497,20 @@
 
     8. Semaphore implementation in blockingconcurrentqueue.h
     This file uses a semaphore implementation under the terms of its separate zlib license.
-    For details, see, dmlc-core/include/dmlc/blockingconcurrentqueue.h
+    For details, see, 3rdparty/dmlc-core/include/dmlc/blockingconcurrentqueue.h
 
     =======================================================================================
 
     9. blockingconcurrentqueue.h
     This file is Distributed under the terms of the simplified BSD license.
-    For details, see, dmlc-core/include/dmlc/blockingconcurrentqueue.h
+    For details, see, 3rdparty/dmlc-core/include/dmlc/blockingconcurrentqueue.h
 
     =======================================================================================
 
+    10. concurrentqueue.h
+    This file is Distributed under the terms of the simplified BSD license.
+    For details, see, 3rdparty/dmlc-core/include/dmlc/concurrentqueue.h
+
+    =======================================================================================
 
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services