ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-24 15:16:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merged in license-info (pull request #562)

Browse Source 
Amended LICENSE and added TRADEMARK file per guidance from R3 legal counsel.
This commit is contained in:
David Lee 2016-11-29 16:00:44 +00:00
commit 28ecea9ad8
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
LICENCE
View File

@ -1,15 +1,13 @@
Copyright 2016, Distributed Ledger Group, LLC, a subsidiary of R3 HoldCo
Copyright 2016, R3 Limited.
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
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
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.
Corda and the Corda logo are trademarks of R3 HoldCo which may be registered in certain jurisdictions.*
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.

5
TRADEMARK Normal file
View File

@ -0,0 +1,5 @@
Corda and the Corda logo are trademarks of R3 Limited.
All rights reserved.
For R3 Limited's trademark and logo usage information, please consult our Trademark Usage Policy available at:
https://www.r3.com/trademark-usage-policy