Skip to content

Commit c7fc1f9

Browse files
emsquaredemsquared
committed
Move license information to Documentation folder
1 parent 1c93d42 commit c7fc1f9

8 files changed

+35
-73
lines changed

‎ACKNOWLEDGEMENT.txt

+4-72
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,5 @@
11

2-
|-----------------------------------------------------------------------|
3-
| |
4-
| Portions of the “Encryption Kit” framework may utilize |
5-
| copyrighted work derived from various 3rd party, open source |
6-
| projects. The use of this work is hereby acknowledged. |
7-
| |
8-
|-----------------------------------------------------------------------|
9-
10-
Classes/OTRKit.m
11-
Classes/OTRKit.h
12-
Classes/OTRTLV.m
13-
Classes/OTRTLV.v
14-
15-
OTRKit <https://github.com/ChatSecure/OTRKit>
16-
17-
Software License Agreement (LGPLv2.1+ / MPL 2.0)
18-
Copyright (c) 2014, Chris Ballinger <[email protected]>. All rights reserved.
19-
20-
# LGPLv2.1+
21-
22-
This library is free software; you can redistribute it and/or
23-
modify it under the terms of the GNU Lesser General Public
24-
License as published by the Free Software Foundation; either
25-
version 2.1 of the License, or (at your option) any later version.
26-
27-
This library is distributed in the hope that it will be useful,
28-
but WITHOUT ANY WARRANTY; without even the implied warranty of
29-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
30-
Lesser General Public License for more details.
31-
32-
You should have received a copy of the GNU Lesser General Public
33-
License along with this library; if not, write to the Free Software
34-
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
35-
36-
# MPL 2.0
37-
38-
This Source Code Form is subject to the terms of the Mozilla Public
39-
License, v. 2.0. If a copy of the MPL was not distributed with this
40-
file, You can obtain one at http://mozilla.org/MPL/2.0/.
41-
42-
|-----------------------------------------------------------------------|
43-
| |
44-
| In binary form, the "Encryption Kit" framework utilizes the |
45-
| following copyrighted works: |
46-
| |
47-
|-----------------------------------------------------------------------|
48-
49-
libgcrypt <http://www.gnu.org/software/libgcrypt/>
50-
51-
Copyright (C) 1989,1991-2015 Free Software Foundation, Inc.
52-
Copyright (C) 2012-2015 g10 Code GmbH
53-
Copyright (C) 2013-2015 Jussi Kivilinna
54-
55-
For licensing information related to this copyrighted work, see the file: LICENSE-GPLv2-1.txt
56-
57-
|-----------------------------------------------------------------------|
58-
59-
libgpg-error <https://www.gnupg.org/related_software/libgpg-error/index.html>
60-
61-
Copyright 2003, 2004, 2005, 2006, 2007, 2013, 2014, 2015 g10 Code GmbH
62-
63-
For licensing information related to this copyrighted work, see the file: LICENSE-GPLv2-1.txt
64-
65-
|-----------------------------------------------------------------------|
66-
67-
libotr <https://otr.cypherpunks.ca>
68-
69-
Copyright (C) 2004-2014 Ian Goldberg, David Goulet, Rob Smits, Chris Alexander, Willy Lew, Lisa Du, Nikita Borisov
70-
71-
<[email protected]>
72-
73-
For licensing information related to this copyrighted work, see the file: LICENSE-GPLv2-1.txt
2+
Portions of the “Encryption Kit” framework may utilize
3+
3rd party copyrighted works, the use of which is hereby
4+
acknowledged. See the “Documentation” directory for author
5+
and license information for these works.

‎LICENSE-GPLv2-1.txt renamed to ‎Documentation/LICENSE-GPLv2-1.txt

File renamed without changes.

‎LICENSE-MPLv2-0.txt renamed to ‎Documentation/LICENSE-MPLv2-0.txt

File renamed without changes.

‎Documentation/LICENSE-OTRKit.txt

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
2+
OTRKit <https://github.com/ChatSecure/OTRKit>
3+
4+
Software License Agreement (LGPLv2.1+ / MPL 2.0)
5+
Copyright (c) 2014, Chris Ballinger <[email protected]>. All rights reserved.
6+
7+
# LGPLv2.1+
8+
9+
This library is free software; you can redistribute it and/or
10+
modify it under the terms of the GNU Lesser General Public
11+
License as published by the Free Software Foundation; either
12+
version 2.1 of the License, or (at your option) any later version.
13+
14+
This library is distributed in the hope that it will be useful,
15+
but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17+
Lesser General Public License for more details.
18+
19+
You should have received a copy of the GNU Lesser General Public
20+
License along with this library; if not, write to the Free Software
21+
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
22+
23+
# MPL 2.0
24+
25+
This Source Code Form is subject to the terms of the Mozilla Public
26+
License, v. 2.0. If a copy of the MPL was not distributed with this
27+
file, You can obtain one at http://mozilla.org/MPL/2.0/.

‎Documentation/libgcrypt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../Libraries/Documentation/libgcrypt

‎Documentation/libgpg-error

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../Libraries/Documentation/libgpg-error

‎Documentation/libotr

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../Libraries/Documentation/libotr

‎Libraries

Submodule Libraries updated 24 files

0 commit comments

Comments
 (0)