Skip to content

Commit 77fbcd5

Browse files
committed
Merge branch 'master' of github.com:hf/leveldb-android
2 parents e87e810 + 225654d commit 77fbcd5

File tree

2 files changed

+97
-51
lines changed

2 files changed

+97
-51
lines changed

.idea/workspace.xml

+96-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

LICENSE.txt

+1-39
Original file line numberDiff line numberDiff line change
@@ -1,39 +1 @@
1-
Stojan Dimitrovski
2-
3-
2014
4-
5-
In the original BSD license, the occurrence of "copyright holder" in the 3rd
6-
clause read "ORGANIZATION", placeholder for "University of California". In the
7-
original BSD license, both occurrences of the phrase "COPYRIGHT HOLDERS AND
8-
CONTRIBUTORS" in the disclaimer read "REGENTS AND CONTRIBUTORS".
9-
10-
Here is the license template:
11-
12-
Copyright (c) 2014, Stojan Dimitrovski <[email protected]>
13-
14-
All rights reserved.
15-
16-
Redistribution and use in source and binary forms, with or without modification,
17-
are permitted provided that the following conditions are met:
18-
19-
1. Redistributions of source code must retain the above copyright notice, this
20-
list of conditions and the following disclaimer.
21-
22-
2. Redistributions in binary form must reproduce the above copyright notice,
23-
this list of conditions and the following disclaimer in the documentation and/or
24-
other materials provided with the distribution.
25-
26-
3. Neither the name of the copyright holder nor the names of its contributors
27-
may be used to endorse or promote products derived from this software without
28-
specific prior written permission.
29-
30-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
31-
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
32-
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
33-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
34-
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
35-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
36-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
37-
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
38-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
39-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1+
LICENSE.txt

0 commit comments

Comments
 (0)