Merge remote branch 'gozala/requirejs'

Conflicts: package.json
2011-02-01 10:42:53 +01:00 · 2011-02-01 10:42:53 +01:00 · 7a209164ba
commit 7a209164ba
parent 91088d9b78 4754582457
1 changed files with 15 additions and 1 deletions
--- a/package.json
+++ b/package.json
@ -10,7 +10,21 @@
        "type" : "git",
         "url" : "http://github.com/ajaxorg/ace.git"
    },
+    "overlay": {
+        "teleport": {
+            "directories": {
+                "lib": "lib/ace",
+                "dependencies": {
+                    "cockpit": ">=0.1.1",
+                    "pilot": ">=0.1.1"
+                }
+            }
+        }
+    },
    "dependencies": {
+        "pilot": ">=0.1.1",
+        "cockpit": ">=0.1.1",
+        "teleport": ">=0.2.6",
        "asyncjs": ">=0.0.2",
        "jsdom": ">=0.1.23",
        "htmlparser": ">=1.7.2",
@ -28,4 +42,4 @@
        "type": "LGPL",
        "url": "http://www.gnu.org/licenses/lgpl.html"
    }]
-}
+}