Commit d92209fd authored by David Cussans's avatar David Cussans

Merge branch 'patch-1' into 'master'

Update LICENSE

See merge request !2
parents f7138af5 2a5fbf43
......@@ -4,4 +4,4 @@ The hardware portions of this project are licenced under the CERN Open Hardware
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
See the `AIDA-2020 TLU - Hardware` , `AIDA-2020 TLU - Gateware` and `AIDA-2020 TLU - Software` subprojects for the licence conditions.
\ 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