github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-24 06:18:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into use-project-relative-status

Browse Source
This commit is contained in:
joshaber
2016-01-04 11:13:56 -05:00
parent b4035547c2 ab3cb1778a
commit 703361afc9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package.json
View File

@@ -28,7 +28,7 @@
"fs-plus": "^2.8.0",
"fstream": "0.1.24",
"fuzzaldrin": "^2.1",
"git-utils": "^4.0.7",
"git-utils": "^4.0.8",
"grim": "1.5.0",
"jasmine-json": "~0.0",
"jasmine-tagged": "^1.1.4",
@@ -137,8 +137,8 @@
"language-php": "0.36.0",
"language-property-list": "0.8.0",
"language-python": "0.42.1",
"language-ruby": "0.65.0",
"language-ruby-on-rails": "0.24.0",
"language-ruby": "0.67.0",
"language-ruby-on-rails": "0.25.0",
"language-sass": "0.45.0",
"language-shellscript": "0.21.0",
"language-source": "0.9.0",

2
src/text-editor.coffee
View File

@@ -3037,7 +3037,7 @@ class TextEditor extends Model
# Essential: Scrolls the editor to the given screen position.
#
# * `screenPosition` An object that represents a buffer position. It can be either
# * `screenPosition` An object that represents a screen position. It can be either
# an {Object} (`{row, column}`), {Array} (`[row, column]`), or {Point}
# * `options` (optional) {Object}
# * `center` Center the editor around the position if possible. (default: false)