Merge remote-tracking branch 'origin/master' into know-when-to-foldem

Browse Source

Conflicts:
	src/app/buffer-marker.coffee
	src/app/cursor.coffee
	src/app/display-buffer-marker.coffee
	src/app/display-buffer.coffee
	src/app/edit-session.coffee
	src/app/fold.coffee
	src/app/line-map.coffee
	src/app/range.coffee
	src/app/selection.coffee
	src/app/text-buffer.coffee

...

This commit is contained in:

Nathan Sobo

2013-05-03 18:29:52 -06:00

parent a2c894bcc9 fa5861a626

commit 3e937e9811

87 changed files with 1665 additions and 1860 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

580

src/app/edit-session.coffee

File diff suppressed because it is too large Load Diff