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

..

frameworks/Sparkle.framework

Use oniguruma node module

2013-03-07 10:45:22 -08:00

linux

Use oniguruma node module

2013-03-07 10:45:22 -08:00

mac

info.plist -> Atom-Info.plist for Constructicon

2013-03-05 14:32:51 -08:00

v8_extensions

Remove $native.absolute()

2013-03-12 19:41:42 -07:00

atom_application.h

Fix objective-c compiler warning

2013-03-11 10:49:01 -07:00

atom_application.mm

Revert "💄"

2013-02-27 10:11:02 -08:00

atom_cef_app.h

Move all code and resources into Atom.framework

2013-03-01 16:35:42 -05:00

atom_cef_client_gtk.cpp

Rename atom folder to native

2012-08-27 13:21:59 -07:00

atom_cef_client_mac.mm

Add atom.getVersion(callback)

2013-02-25 14:58:11 -08:00

atom_cef_client_win.mm

Whitespace 💄

2012-08-28 11:58:24 -05:00

atom_cef_client.cpp

Add atom.getVersion(callback)

2013-02-25 14:58:11 -08:00

atom_cef_client.h

Add atom.getVersion(callback)

2013-02-25 14:58:11 -08:00

atom_cef_render_process_handler.h

Inject all native extensions into web worker contexts

2013-01-24 17:22:50 -08:00

atom_cef_render_process_handler.mm

Use git-utils module

2013-03-09 14:34:06 -08:00

atom_gtk.cpp

Rename atom folder to native

2012-08-27 13:21:59 -07:00

atom_main_mac.mm

Use instantiateWithOwner:topLevelObjects

2013-03-11 10:26:46 -07:00

atom_main.h

Move all code and resources into Atom.framework

2013-03-01 16:35:42 -05:00

atom_win.cpp

Rename atom folder to native

2012-08-27 13:21:59 -07:00

atom_window_controller.h

Add --dev flag and remove --stable flag

2013-02-22 11:54:54 -08:00

atom_window_controller.mm

Load index.html based on the resource path

2013-03-14 17:46:25 -06:00

main.cpp

Move all code and resources into Atom.framework

2013-03-01 16:35:42 -05:00

message_translation.cpp

Remove util.h

2012-08-30 09:07:39 -07:00

message_translation.h

Update C++ headers

2012-08-30 09:11:01 -07:00

path_watcher.h

Unwatch all paths after each test

2012-11-29 15:31:05 -08:00

path_watcher.mm

Call stringByStandardizingPath on moved paths

2013-03-01 13:54:19 -08:00

util.h

Remove util.h

2012-08-30 09:07:39 -07:00