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

Merge branch 'master' of https://github.com/ajaxorg/ace

Browse source 
Conflicts:
	Makefile.dryice.js
	build_support/boot.js
	build_support/mini_require.js
	lib/ace/edit_session.js
	package.json
	support/pilot
This commit is contained in:
Joe Walker 2011-02-19 23:38:07 +00:00
commit f332454b38
196 changed files with 51983 additions and 2086 deletions
Download patch file Download diff file Expand all files Collapse all files

1
support/node-o3-xml

@ -1 +0,0 @@
Subproject commit 563a2b1091bd1b9a7d26a9f597aacb4341edb619

4
support/paths.js
View file

@ -1,4 +1,6 @@
require("./requireJS-node");
require.paths.unshift(__dirname + "/../lib");
require.paths.unshift(__dirname + "/pilot/lib");
require.paths.unshift(__dirname);
require.paths.unshift(__dirname + "/async/lib");
require.paths.unshift(__dirname + "/jsdom/lib");
require.paths.unshift(__dirname);

2
support/pilot

@ -1 +1 @@
Subproject commit 5474f1715dcc199a0c69211c89b594b9f569d9ed
Subproject commit 431459b07ebba0b33f41148fe550e35b7f99af6d