Skip to content

Commit 0898369

Browse files
committed
Update LICENSE
1 parent 7423b4d commit 0898369

File tree

1 file changed

+26
-56
lines changed

1 file changed

+26
-56
lines changed

LICENSE

Lines changed: 26 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
1-
Copyright 2017 SKKU ESLAB, and other contributors.
2-
3-
Licensed under the Apache License, Version 2.0 (the "License");
4-
you may not use this file except in compliance with the License.
5-
You may obtain a copy of the License at
6-
7-
http://www.apache.org/licenses/LICENSE-2.0
8-
9-
Unless required by applicable law or agreed to in writing, software
10-
distributed under the License is distributed on an "AS IS" BASIS
11-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
See the License for the specific language governing permissions and
13-
limitations under the License.
14-
15-
161
Apache License
172
Version 2.0, January 2004
183
http://www.apache.org/licenses/
@@ -188,44 +173,29 @@ limitations under the License.
188173
incurred by, or claims asserted against, such Contributor by reason
189174
of your accepting any such warranty or additional liability.
190175

191-
END OF TERMS AND CONDITIONS
192-
________________
193-
194-
195-
Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
196-
197-
Licensed under the Apache License, Versoin 2.0 (the "License");
198-
you may not use this file except in compilance with the License.
199-
You may obtain a copy of the License at
200-
201-
https://www.apache.org/licenses/LICENSE-2.0
202-
203-
Unless required by applicable law or agreed to in writing, software
204-
distributed under the License is distributed on as "AS IS" BASIS,
205-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
206-
See the License for the specific language governing permissions and
207-
limitations under the License.
208-
209-
This license applies to parts of '*.py' files in '/tools/common_py',
210-
implementing python-based travis script, originating from the
211-
https://github.com/Samsung/iotjs repository;
212-
213-
214-
_____________________
215-
216-
COPYRIGHT
217-
218-
All contributions by the University of California:
219-
Copyright (c) 2014-2017 The Regents of the University of California (Regents)
220-
All rights reserved.
221-
222-
All other contributions:
223-
Copyright (c) 2014-2017, the respective contributors
224-
All rights reserved.
225-
226-
Caffe uses a shared copyright model: each contributor holds copyright over
227-
their contributions to Caffe. The project versioning records all such
228-
contribution and copyright details. If a contributor wants to further mark
229-
their specific copyright on a particular contribution, they should indicate
230-
their copyright solely in the commit message of the change when it is
231-
committed.
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

0 commit comments

Comments
 (0)