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

Merge branch 'ui/navbar'

Browse source 
Conflicts:
	build/demo/kitchen-sink/kitchen-sink-uncompressed.js
	build/src/ace-uncompressed-noconflict.js
	build/src/ace-uncompressed.js
	build/textarea/src/ace-bookmarklet.js
	lib/ace/edit_session.js
	lib/ace/editor.js
	lib/ace/multi_select.js
	lib/ace/selection.js
	lib/ace/virtual_renderer.js
This commit is contained in:
Fabian Jakobs 2012-05-01 11:30:17 +02:00
commit 43c4a8fc35
29 changed files with 630 additions and 287 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/wiki

@ -1 +1 @@
Subproject commit d2a65d0addc2e5ab922bbff9cb6022a4652b4f13
Subproject commit cc5ccde4565f7b21c81345f47e941e011e94b810