github/atom

mirror of https://github.com/atom/atom.git synced 2026-01-23 05:48:10 -05:00

Go to file

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

Merge remote-tracking branch 'origin/master' into cefode

2013-03-20 10:46:50 -06:00

Update relative link for key bindings

2013-03-12 09:40:05 -07:00

💄 add trailing newlines

2013-02-19 10:02:09 -07:00

Merge remote-tracking branch 'origin/master' into cefode

2013-03-20 10:46:50 -06:00

Move old wiki page to notes folder

2012-09-30 15:00:45 -07:00

prebuilt-cef @ 59d147be26

Update prebuilt-cef

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

Use explicit path for node-gyp

2013-03-19 12:32:50 -07:00

Merge remote-tracking branch 'origin/master' into cefode

2013-03-20 10:46:50 -06:00

Merge remote-tracking branch 'origin/master' into cefode

2013-03-20 10:46:50 -06:00

Merge remote-tracking branch 'origin/master' into cefode

2013-03-20 10:46:50 -06:00

Put status indicator on right side of fuzzy finder

2013-03-04 21:43:33 -08:00

no more custom gyp

2012-10-18 16:00:14 -07:00

Merge remote-tracking branch 'origin/master' into cefode

2013-03-20 10:46:50 -06:00

.github

Use docs/manifest.txt to list docs files. Add user-init-script.md.

2013-02-13 16:25:48 -07:00

.gitignore

Update cefode.

2013-03-14 01:15:18 +08:00

.gitmodules

Use HTTPS for prebuilt-cef

2013-03-06 08:30:50 -05:00

.pairs

fix window blur and focus events

2013-02-05 12:03:56 -08:00

atom.gyp

Bundle offical node binary with Atom.

2013-03-13 20:15:41 +08:00

atom.sh

Launch Atom with full path to .app

2013-02-25 16:11:13 -08:00

CHANGELOG.md

Add an empty changelog for Constructicon

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

CONTRIBUTING.md

Mention trailing newline

2013-02-11 09:31:16 -08:00

package.json

Merge remote-tracking branch 'origin/master' into cefode

2013-03-20 10:46:50 -06:00

Rakefile

Run rake clean before running tests

2013-03-19 12:33:16 -07:00

README.md

💄

2013-03-04 22:07:22 -08:00

README.md

Atom — Futuristic Text Editing

Check out our documentation on the docs tab.

Building from source

Requirements

Mountain Lion
The Setup™ or Boxen
Xcode (available in the App Store)

Installation

gh-setup atom
cd ~/github/atom && rake install