Skip to content

Commit 9410e93

Browse files
committed
clarify the license and copyright terms of the project
As has been the case, contributions are copyright their respective contributors and the project is BSD-2 licensed. By contributing to the project, contributors release their contributions under these copyright and license terms as declared in LICENSE.
1 parent 52d7a48 commit 9410e93

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed

CONTRIBUTORS.md

+2
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@ to see line-by-line credits and
1515
to see the change log even across renames and rewrites.
1616

1717
Please refer to the [acknowledgements](http://caffe.berkeleyvision.org/#acknowledgements) on the Caffe site for further details.
18+
19+
**Copyright** is held by the original contributor according to the versioning history; see LICENSE.

LICENSE

+22
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
1+
COPYRIGHT
2+
3+
All contributions by the University of California:
14
Copyright (c) 2014, The Regents of the University of California (Regents)
25
All rights reserved.
36

7+
All other contributions:
8+
Copyright (c) 2014, the respective contributors
9+
All rights reserved.
10+
11+
Caffe uses a shared copyright model: each contributor holds copyright over
12+
their contributions to Caffe. The project versioning records all such
13+
contribution and copyright details. If a contributor wants to further mark
14+
their specific copyright on a particular contribution, they should indicate
15+
their copyright solely in the commit message of the change when it is
16+
committed.
17+
18+
LICENSE
19+
420
Redistribution and use in source and binary forms, with or without
521
modification, are permitted provided that the following conditions are met:
622

@@ -20,3 +36,9 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
2036
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2137
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2238
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
39+
40+
CONTRIBUTION AGREEMENT
41+
42+
By contributing to the BVLC/caffe repository through pull-request, comment,
43+
or otherwise, the contributor releases their content to the
44+
license and copyright terms herein.

0 commit comments

Comments
 (0)