Kevin Sawicki c6d1409151 Merge branch 'master' into summit ...

Conflicts:
	.pairs
	package.json
	spec/app/tokenized-buffer-spec.coffee
	src/app/edit-session.coffee
	src/app/project.coffee
	src/app/window.coffee
	src/atom-application.coffee
	static/root-view.less

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

..

atom-dark-ui

add another color

2013-07-26 16:12:34 -07:00

atom-light-ui

Add collaboration stylesheet for light theme

2013-07-16 09:49:46 -07:00

atom-dark-syntax.less

Remove line highlight in dark syntax

2013-07-19 13:57:08 -07:00

atom-light-syntax.less

Add light syntax colors for embedded strings

2013-06-24 08:33:18 -07:00