Commit graph

6 commits

Author SHA1 Message Date
Fabian Jakobs
aed7ca654c Merge branch 'multiCursor'
Conflicts:
	demo/kitchen-sink/demo.js
	lib/ace/test/all_browser.js
2012-04-12 16:03:24 +02:00
nightwing
b546875c1d Merge remote-tracking branch 'remotes/upstream/master'
Conflicts:
	demo/kitchen-sink/demo.js
2012-03-31 20:39:26 +04:00
Garen Torikian
5a02205fc8 Update to add param colors and more JS functions 2012-03-24 02:47:25 +01:00
Garen Torikian
ee667179b3 Add a few more JS styles for escaped chars & keywords, also tests 2012-03-22 18:17:01 +01:00
nightwing
7f39633a5e add a little more text to js doc for testing multicursor 2012-03-13 21:56:22 +04:00
Fabian Jakobs
606963f424 move kitchen-sink demo into a separate directory 2011-10-13 11:22:19 +02:00
Renamed from demo/docs/javascript.js (Browse further)