Kevin Sawicki & Nathan Sobo 347801b074 Merge branch 'summit' ...

Conflicts:
	src/app/config.coffee
	src/atom-application.coffee
	src/main.coffee

2013-08-19 14:01:24 -07:00

..

app

Merge branch 'summit'

2013-08-19 14:01:24 -07:00

fixtures

Merge branch 'master' into summit

2013-08-14 14:05:35 -07:00

stdlib

Ignore missing symlinks in fsUtils.traverseTreeSync()

2013-08-09 17:23:29 -07:00

atom-reporter.coffee

Remove internal packages section from spec reporter

2013-08-14 08:48:12 -07:00

environment.coffee

Distinguish remote and local selections in EditSession

2013-07-23 17:49:14 -07:00

jasmine-helper.coffee

Use path.extname() instead of fsUtils.extension()

2013-06-12 15:43:58 -07:00

spec-bootstrap.coffee

Remove hash params from url

2013-06-11 11:17:16 -07:00

spec-helper.coffee

Merge branch 'master' into summit

2013-08-14 14:05:35 -07:00

spec-suite.coffee

Default to empty arrays for user and bundled package paths

2013-08-16 20:52:20 -07:00

time-reporter.coffee

Use node's require instead of internal require

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