Lennart Kats 768bfbb1f2 Merge remote-tracking branch 'origin/master' into indent_guides ... Conflicts: lib/ace/theme/textmate.css		2012-08-10 09:51:03 +02:00
..
cursor.js	move text area to cursor only when cursor is moved	2012-05-01 17:32:07 +04:00
gutter.js	remove redundant getRowHeight method	2012-08-03 18:46:58 +04:00
marker.js	size multiline markers with "right" instead of "width"	2012-06-30 13:25:36 +04:00
text.js	update tests	2012-08-02 15:30:36 +04:00
text_test.js	update tests	2012-08-02 15:30:36 +04:00