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 mb-fix-undo-stack-on-reload-again

Browse Source
This commit is contained in:
Max Brunsfeld
2015-09-15 14:33:28 -07:00
parent 24263960ef 8798d69aba
commit d41e48dad0
22 changed files with 282 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
package.json
View File

@@ -1,7 +1,7 @@
{
"name": "atom",
"productName": "Atom",
"version": "1.0.12",
"version": "1.0.12-dev",
"description": "A hackable text editor for the 21st Century.",
"main": "./src/browser/main.js",
"repository": {
@@ -92,7 +92,7 @@
"dev-live-reload": "0.46.0",
"encoding-selector": "0.21.0",
"exception-reporting": "0.36.0",
"find-and-replace": "0.180.0",
"find-and-replace": "0.181.0",
"fuzzy-finder": "0.88.0",
"git-diff": "0.56.0",
"go-to-line": "0.30.0",
@@ -124,7 +124,7 @@
"language-c": "0.47.1",
"language-clojure": "0.16.0",
"language-coffee-script": "0.41.0",
"language-csharp": "0.9.0",
"language-csharp": "0.10.0",
"language-css": "0.34.0",
"language-gfm": "0.81.0",
"language-git": "0.10.0",
@@ -132,20 +132,20 @@
"language-html": "0.41.2",
"language-hyperlink": "0.14.0",
"language-java": "0.16.0",
"language-javascript": "0.93.0",
"language-javascript": "0.94.0",
"language-json": "0.16.0",
"language-less": "0.28.2",
"language-make": "0.17.0",
"language-mustache": "0.12.0",
"language-objective-c": "0.15.0",
"language-perl": "0.28.0",
"language-php": "0.29.0",
"language-perl": "0.29.0",
"language-php": "0.30.0",
"language-property-list": "0.8.0",
"language-python": "0.40.0",
"language-ruby": "0.57.0",
"language-ruby": "0.58.0",
"language-ruby-on-rails": "0.22.0",
"language-sass": "0.41.0",
"language-shellscript": "0.16.0",
"language-shellscript": "0.17.0",
"language-source": "0.9.0",
"language-sql": "0.17.0",
"language-text": "0.7.0",