Commit Graph

2 Commits

Author SHA1 Message Date
Nathan Sobo
454557b502 Merge branch 'master' into global-find
Conflicts:
	spec/extensions/command-panel-spec.coffee
	src/app/buffer.coffee
	src/extensions/command-panel/command-panel.coffee
	src/extensions/command-panel/keymap.coffee
2012-07-24 17:59:49 -06:00
Corey Johnson & Nathan Sobo
5554d15bdb Add sample .atom directory to project root 2012-07-06 12:14:57 -06:00