From a2f7a07c11bfee4bc09a0c87581dc0bb7cffabd8 Mon Sep 17 00:00:00 2001 From: Onoshko Dan Date: Tue, 15 Apr 2014 19:57:14 +0700 Subject: [PATCH] license updated --- COLA LICENSE | 29 ----------------------------- LICENSE | 3 ++- lib/ast.js | 3 +++ lib/parse.js | 3 +++ lib/std.js | 1 - lib/translate.js | 1 - 6 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 COLA LICENSE diff --git a/COLA LICENSE b/COLA LICENSE deleted file mode 100644 index cf6b5f2b..00000000 --- a/COLA LICENSE +++ /dev/null @@ -1,29 +0,0 @@ -ColaScript is released under the BSD license: - -Copyright 2014 (c) Dan Onoshko (dangreen) - -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. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER “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 HOLDER 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. diff --git a/LICENSE b/LICENSE index dd7706f0..7de20b4c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ -UglifyJS is released under the BSD license: +UglifyJS and ColaScript is released under the BSD license: Copyright 2012-2013 (c) Mihai Bazon +Copyright 2014 (c) TrigenSoftware Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/lib/ast.js b/lib/ast.js index beff1390..6366162a 100644 --- a/lib/ast.js +++ b/lib/ast.js @@ -3,6 +3,8 @@ A JavaScript tokenizer / parser / beautifier / compressor. https://github.com/mishoo/UglifyJS2 + Edited for parsing ColaScript. + -------------------------------- (C) --------------------------------- Author: Mihai Bazon @@ -12,6 +14,7 @@ Distributed under the BSD license: Copyright 2012 (c) Mihai Bazon + Copyright 2014 (c) TrigenSoftware Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/lib/parse.js b/lib/parse.js index 3f6a9665..11540a35 100644 --- a/lib/parse.js +++ b/lib/parse.js @@ -3,6 +3,8 @@ A JavaScript tokenizer / parser / beautifier / compressor. https://github.com/mishoo/UglifyJS2 + Edited for parsing ColaScript. + -------------------------------- (C) --------------------------------- Author: Mihai Bazon @@ -12,6 +14,7 @@ Distributed under the BSD license: Copyright 2012 (c) Mihai Bazon + Copyright 2014 (c) TrigenSoftware Parser based on parse-js (http://marijn.haverbeke.nl/parse-js/). Redistribution and use in source and binary forms, with or without diff --git a/lib/std.js b/lib/std.js index d35983fe..a902b348 100644 --- a/lib/std.js +++ b/lib/std.js @@ -1,7 +1,6 @@ /*********************************************************************** ColaScript standart library. Need for translation. - TrigenSoftware. dangreen. Distributed under the BSD license: diff --git a/lib/translate.js b/lib/translate.js index ebaf427f..647d9b51 100644 --- a/lib/translate.js +++ b/lib/translate.js @@ -1,7 +1,6 @@ /*********************************************************************** AST-Tree translator, ColaScript -> JavaScript. - TrigenSoftware. dangreen. Distributed under the BSD license: