github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Kevin Sawicki & Nathan Sobo
2013-03-20 10:46:50 -06:00
parent aae705e82c 9c6978e913
commit 501dc9b76c
104 changed files with 6970 additions and 1164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/editor.coffee
View File

@@ -61,7 +61,7 @@ class Editor extends View
else
{editSession, @mini} = (editSessionOrOptions ? {})
requireStylesheet 'editor.css'
requireStylesheet 'editor.less'
@id = Editor.nextEditorId++
@lineCache = []