Corey Johnson & Nathan Sobo 55dc3e1cdf Merge branch 'master' into config ...

Conflicts:
	spec/app/project-spec.coffee
	src/extensions/wrap-guide/src/wrap-guide.coffee

2012-12-14 14:14:50 -08:00

..

app

Merge branch 'master' into config

2012-12-14 14:14:50 -08:00

fixtures

Display matches when more than one tag is found

2012-12-13 17:12:42 -08:00

stdlib

Add View#observeConfig as a space-pen extension

2012-12-14 14:08:57 -08:00

spec-bootstrap.coffee

Require atom.coffee in spec-bootstrap and benchmark-bootstrap

2012-08-30 11:26:31 -06:00

spec-helper.coffee

Make the font size 16 in specs, because a few specs depend on it

2012-12-12 16:39:30 -08:00

spec-suite.coffee

Look for extension specs in src/extension (more specific) and run the second

2012-10-26 12:25:20 -06:00