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

Go to file

Kevin Sawicki 56a2c79fe1 Merge branch 'collaboration-presence' into shared-buffers

Conflicts:
	src/app/edit-session.coffee
	src/app/project.coffee
	src/app/text-buffer.coffee
	src/app/window.coffee
	src/packages/collaboration/lib/bootstrap.coffee
	src/packages/collaboration/lib/session-utils.coffee
	vendor/telepath

2013-07-22 10:12:45 -07:00

benchmark

Remove Point and Range classes now provided by telepath

2013-07-05 12:53:50 -07:00

docs

Correct broken link to npm

2013-07-12 17:30:05 -07:00

dot-atom

💄 add trailing newlines

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

resources/mac

2013-07-10 18:57:26 +08:00

script

Use atom-shell 23dd5b4da8

2013-07-16 09:48:15 -07:00

spec

Merge branch 'collaboration-presence' into shared-buffers

2013-07-22 10:12:45 -07:00

src

Merge branch 'collaboration-presence' into shared-buffers

2013-07-22 10:12:45 -07:00

static

Set stack trace overflow to auto

2013-07-06 14:27:23 -07:00

tasks

Rebuild native modules when atom-shell is upgraded

2013-07-12 14:48:10 -07:00

themes

Remove unused color from dark collaboration theme

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

vendor

Merge branch 'collaboration-presence' into shared-buffers

2013-07-22 10:12:45 -07:00

.github

Making an edit to .github

2013-04-03 14:44:30 -03:00

.gitignore

Remove unused files from gitignore

2013-06-20 17:15:52 -07:00

.gitmodules

Add telepath as submodule

2013-06-28 04:39:28 -06:00

.nakignore

Remove deleted folder

2013-06-05 10:51:11 -07:00

.pairs

Add pairs file for gjt

2013-05-03 16:57:42 -07:00

Recompile atom-application and atom-window

2013-05-28 17:29:00 -07:00

atom.gyp

Rename create-atom script to constructicon/build

2013-06-20 12:15:35 -07:00

atom.sh

Make atom.sh executable

2013-05-15 10:29:27 -07:00

CHANGELOG.md

Add missing '..' to node directory path

2013-07-15 12:20:09 -07:00

CONTRIBUTING.md

Remove submoduling 3rd-party packages

2013-06-05 10:51:55 -07:00

Gruntfile.coffee

Run partial-clean during deploy task

2013-07-08 11:29:46 -07:00

package.json

Upgrade to patrick 2.0

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

Rakefile

Update documentation

2013-06-21 09:46:25 -07:00

README.md

Update documentation

2013-06-21 09:46:25 -07:00

README.md

Atom — Futuristic Text Editing

Check out our documentation on the docs tab.

Installing

Download the latest Atom release from speakeasy.

It will automatically update when a new release is available.

Building

Requirements

Mountain Lion
Boxen (Obviously Atom won't release with this requirement)

Installation

gh-setup atom
cd ~/github/atom
script/build