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

Merge commit '6808e3bb35'

Browse source 
Conflicts:
	.gitmodules
	Makefile.dryice.js
	demo/demo.js
	demo/kitchen-sink/boot.js
	kitchen-sink.html
	lib/ace/commands/default_commands.js
	lib/ace/test/tests.html
	package.json
	support/pilot
This commit is contained in:
Fabian Jakobs 2011-11-02 13:25:32 +01:00
commit 62a3b4edf5
18 changed files with 704 additions and 808 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.gitmodules vendored
View file

@ -5,8 +5,5 @@
path = node_modules/dryice
url = git://github.com/ajaxorg/dryice.git
[submodule "node_modules/pilot"]
path = node_modules/pilot
url = git://github.com/ajaxorg/pilot.git
[submodule "node_modules/cockpit"]
path = node_modules/cockpit
url = git://github.com/ajaxorg/cockpit.git
path = node_modules/pilot
url = git://github.com/ajaxorg/pilot.git