Skip to content

Commit 7861d19

Browse files
author
Jorge Costa
committed
Merge branch 'release/0.4.2'
2 parents 2cc52d7 + 847795e commit 7861d19

73 files changed

Lines changed: 3105 additions & 1539 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ hs_err_pid*
5959
# Track copyright configuration
6060
!.idea/copyright
6161
.idea/copyright/*
62-
!.idea/copyright/ADAL_GNU_LESSER_GENERAL_PUBLIC_LICENSE.xml
62+
!.idea/copyright/AFM_MIT_LICENSE.xml
6363
!.idea/copyright/profiles_settings.xml
6464

6565
# if you remove the above rule, at least ignore the following:
@@ -68,6 +68,7 @@ hs_err_pid*
6868
# .idea/workspace.xml
6969
# .idea/tasks.xml
7070
# .idea/dictionaries
71+
# .idea/misc.xml
7172

7273
# Sensitive or high-churn files:
7374
# .idea/dataSources.ids

.idea/copyright/AFM_MIT_License.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/copyright/profiles_settings.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

LICENSE.md

Lines changed: 25 additions & 157 deletions
Original file line numberDiff line numberDiff line change
@@ -1,157 +1,25 @@
1-
### GNU LESSER GENERAL PUBLIC LICENSE
2-
3-
Version 3, 29 June 2007
4-
5-
Copyright (C) 2007 Free Software Foundation, Inc.
6-
<http://fsf.org/>
7-
8-
Everyone is permitted to copy and distribute verbatim copies of this
9-
license document, but changing it is not allowed.
10-
11-
This version of the GNU Lesser General Public License incorporates the
12-
terms and conditions of version 3 of the GNU General Public License,
13-
supplemented by the additional permissions listed below.
14-
15-
#### 0. Additional Definitions.
16-
17-
As used herein, "this License" refers to version 3 of the GNU Lesser
18-
General Public License, and the "GNU GPL" refers to version 3 of the
19-
GNU General Public License.
20-
21-
"The Library" refers to a covered work governed by this License, other
22-
than an Application or a Combined Work as defined below.
23-
24-
An "Application" is any work that makes use of an interface provided
25-
by the Library, but which is not otherwise based on the Library.
26-
Defining a subclass of a class defined by the Library is deemed a mode
27-
of using an interface provided by the Library.
28-
29-
A "Combined Work" is a work produced by combining or linking an
30-
Application with the Library. The particular version of the Library
31-
with which the Combined Work was made is also called the "Linked
32-
Version".
33-
34-
The "Minimal Corresponding Source" for a Combined Work means the
35-
Corresponding Source for the Combined Work, excluding any source code
36-
for portions of the Combined Work that, considered in isolation, are
37-
based on the Application, and not on the Linked Version.
38-
39-
The "Corresponding Application Code" for a Combined Work means the
40-
object code and/or source code for the Application, including any data
41-
and utility programs needed for reproducing the Combined Work from the
42-
Application, but excluding the System Libraries of the Combined Work.
43-
44-
#### 1. Exception to Section 3 of the GNU GPL.
45-
46-
You may convey a covered work under sections 3 and 4 of this License
47-
without being bound by section 3 of the GNU GPL.
48-
49-
#### 2. Conveying Modified Versions.
50-
51-
If you modify a copy of the Library, and, in your modifications, a
52-
facility refers to a function or data to be supplied by an Application
53-
that uses the facility (other than as an argument passed when the
54-
facility is invoked), then you may convey a copy of the modified
55-
version:
56-
57-
- a) under this License, provided that you make a good faith effort
58-
to ensure that, in the event an Application does not supply the
59-
function or data, the facility still operates, and performs
60-
whatever part of its purpose remains meaningful, or
61-
- b) under the GNU GPL, with none of the additional permissions of
62-
this License applicable to that copy.
63-
64-
#### 3. Object Code Incorporating Material from Library Header Files.
65-
66-
The object code form of an Application may incorporate material from a
67-
header file that is part of the Library. You may convey such object
68-
code under terms of your choice, provided that, if the incorporated
69-
material is not limited to numerical parameters, data structure
70-
layouts and accessors, or small macros, inline functions and templates
71-
(ten or fewer lines in length), you do both of the following:
72-
73-
- a) Give prominent notice with each copy of the object code that
74-
the Library is used in it and that the Library and its use are
75-
covered by this License.
76-
- b) Accompany the object code with a copy of the GNU GPL and this
77-
license document.
78-
79-
#### 4. Combined Works.
80-
81-
You may convey a Combined Work under terms of your choice that, taken
82-
together, effectively do not restrict modification of the portions of
83-
the Library contained in the Combined Work and reverse engineering for
84-
debugging such modifications, if you also do each of the following:
85-
86-
- a) Give prominent notice with each copy of the Combined Work that
87-
the Library is used in it and that the Library and its use are
88-
covered by this License.
89-
- b) Accompany the Combined Work with a copy of the GNU GPL and this
90-
license document.
91-
- c) For a Combined Work that displays copyright notices during
92-
execution, include the copyright notice for the Library among
93-
these notices, as well as a reference directing the user to the
94-
copies of the GNU GPL and this license document.
95-
- d) Do one of the following:
96-
- 0) Convey the Minimal Corresponding Source under the terms of
97-
this License, and the Corresponding Application Code in a form
98-
suitable for, and under terms that permit, the user to
99-
recombine or relink the Application with a modified version of
100-
the Linked Version to produce a modified Combined Work, in the
101-
manner specified by section 6 of the GNU GPL for conveying
102-
Corresponding Source.
103-
- 1) Use a suitable shared library mechanism for linking with
104-
the Library. A suitable mechanism is one that (a) uses at run
105-
time a copy of the Library already present on the user's
106-
computer system, and (b) will operate properly with a modified
107-
version of the Library that is interface-compatible with the
108-
Linked Version.
109-
- e) Provide Installation Information, but only if you would
110-
otherwise be required to provide such information under section 6
111-
of the GNU GPL, and only to the extent that such information is
112-
necessary to install and execute a modified version of the
113-
Combined Work produced by recombining or relinking the Application
114-
with a modified version of the Linked Version. (If you use option
115-
4d0, the Installation Information must accompany the Minimal
116-
Corresponding Source and Corresponding Application Code. If you
117-
use option 4d1, you must provide the Installation Information in
118-
the manner specified by section 6 of the GNU GPL for conveying
119-
Corresponding Source.)
120-
121-
#### 5. Combined Libraries.
122-
123-
You may place library facilities that are a work based on the Library
124-
side by side in a single library together with other library
125-
facilities that are not Applications and are not covered by this
126-
License, and convey such a combined library under terms of your
127-
choice, if you do both of the following:
128-
129-
- a) Accompany the combined library with a copy of the same work
130-
based on the Library, uncombined with any other library
131-
facilities, conveyed under the terms of this License.
132-
- b) Give prominent notice with the combined library that part of it
133-
is a work based on the Library, and explaining where to find the
134-
accompanying uncombined form of the same work.
135-
136-
#### 6. Revised Versions of the GNU Lesser General Public License.
137-
138-
The Free Software Foundation may publish revised and/or new versions
139-
of the GNU Lesser General Public License from time to time. Such new
140-
versions will be similar in spirit to the present version, but may
141-
differ in detail to address new problems or concerns.
142-
143-
Each version is given a distinguishing version number. If the Library
144-
as you received it specifies that a certain numbered version of the
145-
GNU Lesser General Public License "or any later version" applies to
146-
it, you have the option of following the terms and conditions either
147-
of that published version or of any later version published by the
148-
Free Software Foundation. If the Library as you received it does not
149-
specify a version number of the GNU Lesser General Public License, you
150-
may choose any version of the GNU Lesser General Public License ever
151-
published by the Free Software Foundation.
152-
153-
If the Library as you received it specifies that a proxy can decide
154-
whether future versions of the GNU Lesser General Public License shall
155-
apply, that proxy's public statement of acceptance of any version is
156-
permanent authorization for you to choose that version for the
157-
Library.
1+
The MIT License (MIT)
2+
=====================
3+
4+
Copyright © `2017` `copyright massivedisaster`
5+
6+
Permission is hereby granted, free of charge, to any person
7+
obtaining a copy of this software and associated documentation
8+
files (the “Software”), to deal in the Software without
9+
restriction, including without limitation the rights to use,
10+
copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
copies of the Software, and to permit persons to whom the
12+
Software is furnished to do so, subject to the following
13+
conditions:
14+
15+
The above copyright notice and this permission notice shall be
16+
included in all copies or substantial portions of the Software.
17+
18+
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
19+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
20+
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
21+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
22+
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
23+
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
24+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
25+
OTHER DEALINGS IN THE SOFTWARE.

0 commit comments

Comments
 (0)