Permalink
Browse files

new license

  • Loading branch information...
yeikos committed May 10, 2013
1 parent 5601da8 commit 22220b22a266e58ecc2469ed6d40d7db8c15e825
Showing with 45 additions and 11 deletions.
  1. +21 −0 LICENSE
  2. +1 −1 README.md
  3. +3 −4 merge.js
  4. +1 −1 merge.min.js
  5. +18 −4 package.json
  6. +1 −1 tests/index.html
21 LICENSE
@@ -0,0 +1,21 @@
The MIT License (MIT)
Copyright (c) 2013 yeikos - http://www.yeikos.com
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
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 SOFTWARE.
@@ -1,4 +1,4 @@
JavaScript/NodeJS Merge v1.1.0
JavaScript/NodeJS Merge v1.1.1
==================================================
What is it?
@@ -1,11 +1,10 @@
/*!
* @name JavaScript/NodeJS Merge v1.1.0
* @name JavaScript/NodeJS Merge v1.1.1
* @author yeikos
* @repository https://github.com/yeikos/js.merge
* Copyright 2013
* GNU General Public License
* http://www.gnu.org/licenses/gpl-3.0.txt
* Copyright 2013 yeikos - MIT license
* https://raw.github.com/yeikos/js.merge/master/LICENSE
*/
;(function(isNode) {

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -1,10 +1,24 @@
{
"name": "merge",
"version": "1.1.0",
"author": "yeikos",
"version": "1.1.1",
"author": "yeikos (http://www.yeikos.com)",
"description": "JavaScript/NodeJS Merge is a tool to merge multiple objects into one object, with the possibility of create a new object cloned. His operation is very similar to the jQuery.extend function but more flexible.",
"main": "merge.js",
"license": "MIT",
"homepage": "https://github.com/yeikos/js.merge",
"main": "merge.js"
"repository": {
"type": "git",
"url": "https://github.com/yeikos/js.merge.git"
},
"keywords": [
"merge",
"extend",
"clone",
"object",
"browser"
]
}
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>JavaScript/NodeJS Merge v1.1.0</title>
<title>JavaScript/NodeJS Merge v1.1.1</title>
<link rel="stylesheet" href="qunit/qunit.css" />

0 comments on commit 22220b2

Please sign in to comment.