jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote branch 'gozala/requirejs'

Browse source 
Conflicts:
	package.json
This commit is contained in:
Fabian Jakobs 2011-02-01 10:42:53 +01:00
commit 7a209164ba
1 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
package.json
View file

@ -10,7 +10,21 @@
"type" : "git", "type" : "git",
"url" : "http://github.com/ajaxorg/ace.git" "url" : "http://github.com/ajaxorg/ace.git"
}, },
"overlay": {
"teleport": {
"directories": {
"lib": "lib/ace",
"dependencies": {
"cockpit": ">=0.1.1",
"pilot": ">=0.1.1"
}
}
}
},
"dependencies": { "dependencies": {
"pilot": ">=0.1.1",
"cockpit": ">=0.1.1",
"teleport": ">=0.2.6",
"asyncjs": ">=0.0.2", "asyncjs": ">=0.0.2",
"jsdom": ">=0.1.23", "jsdom": ">=0.1.23",
"htmlparser": ">=1.7.2", "htmlparser": ">=1.7.2",