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

..

app

Merge branch 'collaboration-presence' into shared-buffers

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

fixtures

Remove logging of pid

2013-06-17 12:11:26 -07:00

stdlib

Don't call realpathSync for non-existent directory

2013-07-01 13:23:47 -07:00

atom-reporter.coffee

Display CoffeeScript line numbers in stack traces

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

jasmine-helper.coffee

Use path.extname() instead of fsUtils.extension()

2013-06-12 15:43:58 -07:00

spec-bootstrap.coffee

Remove hash params from url

2013-06-11 11:17:16 -07:00

spec-helper.coffee

Use atom-shell 23dd5b4da8

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

spec-suite.coffee

Rename listTree() to listTreeSync()

2013-06-12 18:26:44 -07:00

time-reporter.coffee

Use node's require instead of internal require

2013-03-12 10:38:05 -07:00