Nathan Sobo 3e937e9811 Merge remote-tracking branch 'origin/master' into know-when-to-foldem ...

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

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

..

app

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

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

fixtures

Add atom.activatePackageConfig, which is called in config windows

2013-04-26 15:32:47 -07:00

stdlib

Write empty object values on same line as keys

2013-04-30 22:43:51 -07:00

atom-reporter.coffee

Fix jasmine styling

2013-04-15 20:45:55 -06:00

jasmine-focused.coffee

Move jasmine-focused to spec folder

2013-03-20 18:36:55 -07:00

jasmine-helper.coffee

Make all requires of 'fs-utils' assign to fsUtils var instead of fs

2013-04-03 12:01:37 -06:00

spec-bootstrap.coffee

Log error when no stack exists

2013-04-02 14:40:30 -07:00

spec-helper.coffee

Don't assign window.jQuery in jasmine-jquery.js helper

2013-04-26 15:36:13 -07:00

spec-suite.coffee

Make all requires of 'fs-utils' assign to fsUtils var instead of fs

2013-04-03 12:01:37 -06:00

time-reporter.coffee

Use node's require instead of internal require

2013-03-12 10:38:05 -07:00