Corey Johnson & Nathan Sobo 28ff26e845 Merge branch 'master' into statusbar ...

Conflicts:
	src/app/editor.coffee
	src/app/project.coffee
	src/app/root-view.coffee

2012-05-04 11:41:13 -06:00

..

app

Merge branch 'master' into statusbar

2012-05-04 11:41:13 -06:00

extensions

Rename RootView.registerExtension() to RootView.activateExtension()

2012-05-03 17:13:09 -07:00

fixtures

Display directories first in the tree view. Style file names at same indent as directory names (beyond disclosure arrow)

2012-04-23 15:00:11 -06:00

stdlib

Add fs.extension

2012-05-01 14:07:05 -07:00

spec-bootstrap.coffee

Extract jasmine code into jasmine-helper

2012-03-15 10:46:40 -07:00

spec-helper.coffee

Merge branch 'master' into statusbar

2012-05-04 11:41:13 -06:00

spec-suite.coffee

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

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