Nathan Sobo 1886b2a48e Merge branch 'master' of github.com:github/atom into global-find ...

Conflicts:
	spec/app/buffer-spec.coffee
	spec/extensions/command-panel-spec.coffee
	spec/extensions/tree-view-spec.coffee
	src/app/buffer.coffee
	src/extensions/command-panel/command-panel.coffee
	src/extensions/command-panel/keymap.coffee

2012-07-25 13:38:12 -06:00

..

app

Merge branch 'master' of github.com:github/atom into global-find

2012-07-25 13:38:12 -06:00

extensions

Merge branch 'master' of github.com:github/atom into global-find

2012-07-25 13:38:12 -06:00

fixtures

Ensure that Project.scan handles evil file fixtures correctly

2012-07-19 11:15:08 -06:00

stdlib

Reject exec promise with hash instead of string

2012-07-12 12:18:53 -07:00

spec-bootstrap.coffee

Newline at end of file 💄

2012-06-01 14:01:00 -06:00

spec-helper.coffee

Buffers are memoized on project by path

2012-07-18 12:56:09 -07:00

spec-suite.coffee

atom variable holds all global state and is shared across contexts.

2012-02-28 13:14:35 -08:00