Kevin Sawicki & Nathan Sobo 501dc9b76c Merge remote-tracking branch 'origin/master' into cefode ... Conflicts: native/v8_extensions/native.mm spec/app/config-spec.coffee spec/app/window-spec.coffee spec/spec-helper.coffee spec/stdlib/fs-utils-spec.coffee src/app/atom-package.coffee src/app/config.coffee src/app/window.coffee src/packages/fuzzy-finder/lib/load-paths-handler.coffee src/packages/markdown-preview/lib/markdown-preview-view.coffee src/packages/tree-view/spec/tree-view-spec.coffee src/stdlib/require.coffee		2013-03-20 10:46:50 -06:00
..
fixtures	Use node's require instead of internal require	2013-03-12 10:38:05 -07:00
benchmark-bootstrap.coffee	Require atom.coffee in spec-bootstrap and benchmark-bootstrap	2012-08-30 11:26:31 -06:00
benchmark-helper.coffee	Use node's require instead of internal require	2013-03-12 10:38:05 -07:00
benchmark-suite.coffee	Use node's require instead of internal require	2013-03-12 10:38:05 -07:00