Merge branch 'master' into add-subword-cursors-4

Browse Source

Conflicts:
	spec/text-editor-spec.coffee

...

This commit is contained in:

Nathan Sobo

2015-06-30 15:43:33 -05:00

parent c8b4129b31 c0132ea04a

commit 83bddaf34e

253 changed files with 13174 additions and 8112 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

805

src/text-editor.coffee

File diff suppressed because it is too large Load Diff