Update requirejs to compatible version, remove r.js

Conflicts:
	package.json

1 files changed, 46 insertions, 46 deletions

diff --git a/package.json b/package.json
index fb04545be..8d226ec98 100644
--- a/package.json
+++ b/package.json
@@ -1,48 +1,48 @@
 {
-	"name": "jquery",
-	"title": "jQuery",
-	"description": "JavaScript library for DOM operations",
-	"version": "1.11.0-pre",
-	"homepage": "http://jquery.com",
-	"author": {
-		"name": "jQuery Foundation and other contributors",
-		"url": "https://github.com/jquery/jquery/blob/master/AUTHORS.txt"
-	},
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/jquery/jquery.git"
-	},
-	"keywords": [
-		"jquery",
-		"javascript",
-		"library"
-	],
-	"bugs": {
-		"url": "http://bugs.jquery.com"
-	},
-	"licenses": [
-		{
-			"type": "MIT",
-			"url": "https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt"
-		}
-	],
-	"dependencies": {},
-	"devDependencies": {
-		"archiver": "~0.4.9",
-		"grunt": "~0.4.1",
-		"grunt-compare-size": "~0.4.0",
-		"grunt-contrib-jshint": "~0.6.4",
-		"grunt-contrib-uglify": "~0.2.4",
-		"grunt-contrib-watch": "~0.5.3",
-		"grunt-git-authors": "~1.2.0",
-		"grunt-jsonlint": "~1.0.0",
-		"gzip-js": "0.3.2",
-		"testswarm": "~1.1.0",
-		"requirejs": "~2.1.8",
-		"which": "~1.0.5"
-	},
-	"scripts": {
-		"install": "node build/bower-install",
-		"test": "grunt"
-	}
+  "name": "jquery",
+  "title": "jQuery",
+  "description": "JavaScript library for DOM operations",
+  "version": "1.11.0-pre",
+  "homepage": "http://jquery.com",
+  "author": {
+    "name": "jQuery Foundation and other contributors",
+    "url": "https://github.com/jquery/jquery/blob/master/AUTHORS.txt"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/jquery/jquery.git"
+  },
+  "keywords": [
+    "jquery",
+    "javascript",
+    "library"
+  ],
+  "bugs": {
+    "url": "http://bugs.jquery.com"
+  },
+  "licenses": [
+    {
+      "type": "MIT",
+      "url": "https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt"
+    }
+  ],
+  "dependencies": {},
+  "devDependencies": {
+    "archiver": "~0.4.9",
+    "grunt": "~0.4.1",
+    "grunt-compare-size": "~0.4.0",
+    "grunt-contrib-jshint": "~0.6.4",
+    "grunt-contrib-uglify": "~0.2.4",
+    "grunt-contrib-watch": "~0.5.3",
+    "grunt-git-authors": "~1.2.0",
+    "grunt-jsonlint": "~1.0.0",
+    "gzip-js": "0.3.2",
+    "testswarm": "~1.1.0",
+    "requirejs": "~2.1.9",
+    "which": "~1.0.5"
+  },
+  "scripts": {
+    "install": "node build/bower-install",
+    "test": "grunt"
+  }
 }