v1.1.2

swordev · Aug 4, 2013 · b21b8c0 · b21b8c0
1 parent 22220b2
commit b21b8c0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-JavaScript/NodeJS Merge v1.1.1
+JavaScript/NodeJS Merge v1.1.2
 ==================================================
 
 What is it?
@@ -29,7 +29,7 @@ Example from NodeJS
 Example from JavaScript browser
 --------------------------
 
-	<script src="http://yeikos.googlecode.com/files/merge.js"></script>
+	<script src="http://files.yeikos.com/merge.js"></script>
 
 	<script>
 		

diff --git a/merge.js b/merge.js
@@ -1,5 +1,5 @@
 /*!
- * @name JavaScript/NodeJS Merge v1.1.1
+ * @name JavaScript/NodeJS Merge v1.1.2
  * @author yeikos
  * @repository https://github.com/yeikos/js.merge
 

diff --git a/merge.min.js b/merge.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 
 	"name": "merge",
-	"version": "1.1.1",
+	"version": "1.1.2",
 	"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",

diff --git a/tests/index.html b/tests/index.html
@@ -3,7 +3,7 @@
     <head>
 
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>JavaScript/NodeJS Merge v1.1.1</title>
+        <title>JavaScript/NodeJS Merge v1.1.2</title>
 
         <link rel="stylesheet" href="qunit/qunit.css" />