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 branch 'master' into ns-ks-react-dont-measure-when-hidden

Browse Source 
Conflicts:
	spec/editor-component-spec.coffee
	src/editor-component.coffee
	src/editor-scroll-view-component.coffee
	src/lines-component.coffee
This commit is contained in:
Nathan Sobo
2014-05-22 10:48:21 -06:00
parent 08d28d7ed4 b6fb996ceb
commit 875cfefd36
19 changed files with 106 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/selection-component.coffee
View File

@@ -1,5 +1,5 @@
React = require 'react'
{div} = require 'reactionary'
React = require 'react-atom-fork'
{div} = require 'reactionary-atom-fork'
module.exports =
SelectionComponent = React.createClass