Skip to content

Commit 2bd27a3

Browse files
committedSep 5, 2015
update copyright/license
1 parent eb554f8 commit 2bd27a3

File tree

4 files changed

+723
-3
lines changed

4 files changed

+723
-3
lines changed
 

Diff for: ‎CONTRIBUTING

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
Authors retain copyright of their contributions to ARTIQ, but whenever possible
2+
should use the GNU GPL version 3 license for them to be merged.
3+
4+
Works of US government employees are not copyrighted but can also be merged.
5+
6+
We've introduced a "sign-off" procedure on patches that are being sent around.
7+
8+
The sign-off is a simple line at the end of the explanation for the
9+
patch, which certifies that you wrote it or otherwise have the right to
10+
pass it on as an open-source patch. The rules are pretty simple: if you
11+
can certify the below:
12+
13+
Developer's Certificate of Origin (1.1 from the Linux kernel)
14+
15+
By making a contribution to this project, I certify that:
16+
17+
(a) The contribution was created in whole or in part by me and I
18+
have the right to submit it under the open source license
19+
indicated in the file; or
20+
21+
(b) The contribution is based upon previous work that, to the best
22+
of my knowledge, is covered under an appropriate open source
23+
license and I have the right under that license to submit that
24+
work with modifications, whether created in whole or in part
25+
by me, under the same open source license (unless I am
26+
permitted to submit under a different license), as indicated
27+
in the file; or
28+
29+
(c) The contribution was provided directly to me by some other
30+
person who certified (a), (b) or (c) and I have not modified
31+
it.
32+
33+
(d) I understand and agree that this project and the contribution
34+
are public and that a record of the contribution (including all
35+
personal information I submit with it, including my sign-off) is
36+
maintained indefinitely and may be redistributed consistent with
37+
this project or the open source license(s) involved.
38+
39+
then you just add a line saying
40+
41+
Signed-off-by: Random J Developer <random@developer.example.org>
42+
43+
using your real name (sorry, no pseudonyms or anonymous contributions.)
Has conversations. Original line has conversations.
44+
45+
ARTIQ files that do not contain a license header are copyrighted by M-Labs Limited
46+
and are licensed under GNU GPL version 3.

Diff for: ‎LICENSE

+674
Large diffs are not rendered by default.

Diff for: ‎README.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ nanosecond timing resolution and sub-microsecond latency.
1313

1414
Technologies employed include Python, Migen, MiSoC/mor1kx, LLVM and llvmlite.
1515

16-
ARTIQ is licensed under 3-clause BSD.
17-
1816
Website:
1917
http://m-labs.hk/artiq
18+
19+
Copyright (C) 2014-2015 M-Labs Limited. Licensed under GNU GPL version 3.

Diff for: ‎doc/manual/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def __getattr__(cls, name):
6666

6767
# General information about the project.
6868
project = 'ARTIQ'
69-
copyright = '2014-2015, M-Labs / NIST Ion Storage Group'
69+
copyright = '2014-2015, M-Labs Limited'
7070

7171
# The version info for the project you're documenting, acts as replacement for
7272
# |version| and |release|, also used in various other places throughout the

0 commit comments

Comments
 (0)
Please sign in to comment.