Merge remote branch 'origin/master'

Conflicts: lib/ace/editor.js lib/ace/test/change_document_test.js lib/ace/test/event_emitter_test.js lib/ace/test/text_edit_test.js lib/ace/test/virtual_renderer_test.js
2010-12-02 11:21:09 +00:00 · 2010-12-02 11:21:09 +00:00 · 864eb77d4d
commit 864eb77d4d
parent 5ba1d3f75e 8f0d0a555f
5 changed files with 3 additions and 9 deletions
--- a/lib/ace/test/virtual_renderer_test.js
+++ b/lib/ace/test/virtual_renderer_test.js
@ -35,7 +35,6 @@
 *
 * ***** END LICENSE BLOCK ***** */

-
 require("../../../support/paths");

 var Document        = "../document",