Skip to content

Commit

Permalink
update license
Browse files Browse the repository at this point in the history
  • Loading branch information
woodsmc committed Mar 22, 2018
1 parent ba3854e commit a52c262
Showing 1 changed file with 34 additions and 2 deletions.
36 changes: 34 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ Apache License
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright {yyyy} {name of copyright owner}
(c) Copyright 2018 Mind-Flip Limited

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -198,4 +198,36 @@ Apache License
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.


This work is based on the Sisyphus (Distributed Compute) work
originally released by Intel as part of the FI-WARE project. The
original Intel license is also included below.



(c) Copyright 2013 Intel Performance Learning Solutions Ltd, Intel Corporation

Licensed under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance with the License. You may obtain a copy of
the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

In addition to the Apache License, Version 2.0, please note that:
This software is subject to the U.S. Export Administration Regulations
and other U.S. law, and may not be exported or re-exported to certain
countries (Cuba, Iran, North Korea, Sudan, and Syria) or to persons or
entities prohibited from receiving U.S. exports (including Denied Parties,
Specially Designated Nationals, and entities on the Bureau of Export
Administration Entity List or involved with missile technology or nuclear,
chemical or biological weapons).


0 comments on commit a52c262

Please sign in to comment.