Better License file. Yikes!
This commit is contained in:
parent
930a9f4f23
commit
8e89a1fca2
32
LICENSE
32
LICENSE
|
@ -1,36 +1,5 @@
|
||||||
<<<<<<< HEAD
|
|
||||||
Copyright (c) 2014, Elf M. Sternberg
|
Copyright (c) 2014, Elf M. Sternberg
|
||||||
|
|
||||||
All rights reserved.
|
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
|
||||||
modification, are permitted provided that the following conditions are
|
|
||||||
met:
|
|
||||||
|
|
||||||
* Redistributions of source code must retain the above copyright
|
|
||||||
notice, this list of conditions and the following disclaimer.
|
|
||||||
|
|
||||||
* Redistributions in binary form must reproduce the above copyright
|
|
||||||
notice, this list of conditions and the following disclaimer in
|
|
||||||
the documentation and/or other materials provided with the
|
|
||||||
distribution.
|
|
||||||
|
|
||||||
* Neither the name of Elf M. Sternberg nor the names of other
|
|
||||||
contributors may be used to endorse or promote products derived
|
|
||||||
from this software without specific prior written permission.
|
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
|
|
||||||
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
|
||||||
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
|
|
||||||
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
|
|
||||||
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
|
||||||
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
|
||||||
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
|
||||||
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
||||||
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
=======
|
|
||||||
The MIT License (MIT)
|
The MIT License (MIT)
|
||||||
|
|
||||||
Copyright (c) 2015 Ken "Elf" Mathieu Sternberg
|
Copyright (c) 2015 Ken "Elf" Mathieu Sternberg
|
||||||
|
@ -53,4 +22,3 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
SOFTWARE.
|
SOFTWARE.
|
||||||
|
|
||||||
>>>>>>> 2ad6eed680a8208c130b4b9281e2238b705ca2ee
|
|
||||||
|
|
7
Makefile
7
Makefile
|
@ -1,7 +1,5 @@
|
||||||
.PHONY: test
|
.PHONY: test
|
||||||
|
|
||||||
# docs: $(patsubst %.md,%.html,$(wildcard *.md))
|
|
||||||
|
|
||||||
targets = lists.js reduce.js
|
targets = lists.js reduce.js
|
||||||
|
|
||||||
all: $(targets)
|
all: $(targets)
|
||||||
|
@ -9,11 +7,6 @@ all: $(targets)
|
||||||
%.js: src/%.coffee
|
%.js: src/%.coffee
|
||||||
coffee -c -o . $<
|
coffee -c -o . $<
|
||||||
|
|
||||||
%.html: %.md header.html footer.html
|
|
||||||
cat header.html > $@
|
|
||||||
pandoc $< >> $@
|
|
||||||
cat footer.html >> $@
|
|
||||||
|
|
||||||
node_modules: package.json
|
node_modules: package.json
|
||||||
mkdir -p node_modules
|
mkdir -p node_modules
|
||||||
npm install
|
npm install
|
||||||
|
|
Loading…
Reference in New Issue