Merge branch 'match-on-tokens' of https://github.com/dgeorge/ace into dgeorge-match-on-tokens

Conflicts:
	lib/ace/edit_session.js
	lib/ace/edit_session_test.js
	lib/ace/test/all_browser.js
This commit is contained in:
Fabian Jakobs 2011-11-15 11:01:24 +01:00
commit c1082c648c
7 changed files with 577 additions and 95 deletions

View file

@ -39,6 +39,7 @@ var tests = [
require("ace/range_test"),
require("ace/search_test"),
require("ace/selection_test"),
require("ace/token_iterator_test"),
require("ace/virtual_renderer_test")
]