Skip to content

A
AIDA-2020 TLU
Commit f7138af5 authored by David Cussans's avatar David Cussans
Browse files
Options

Merge branch 'patch-1' into 'master' 

Update LICENSE

See merge request !1
parents bcbfa5a2 825921f9
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 10 deletions
LICENSE
View file @ f7138af5
Copyright 2017 University of Bristol
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
The hardware portions of this project are licenced under the CERN Open Hardware Licence.
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.
The firmware(gateware) and software portions of this project are licenced under GPL v3.0
See the `AIDA-2020 TLU - Hardware` , `AIDA-2020 TLU - Gateware` and `AIDA-2020 TLU - Software` subprojects
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment