Merge remote-tracking branch 'peter-b/master'

macMikey · macMikey · commit 3b67f26b96ad · 2015-10-20T12:07:43.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.6.0 - Linting and script-only stacks
+* LiveCode Script grammar and snippets generated from documentation
+* Support for script-only stacks (`.livecodescript`)
+* Linting & syntax checking for LiveCode Script files
+* Initial linting support for LiveCode Builder source files
+
 ## 0.5.1 - Minor documentation updates
 
 ## 0.5.0 - Added LiveCode server support
diff --git a/README.md b/README.md
@@ -89,8 +89,8 @@ fine the appropriate `*.lci` file in the `.lci` directory.
 
 * Ralf Bitter
 * Peter Brett
-* Adam Robertson
 * Monte Goulding
+* Adam Robertson
 
 ## Reporting bugs and contributing
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "language-livecode",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "Support for editing LiveCode source code",
   "repository": "https://github.com/peter-b/atom-language-livecode",
   "license": "GPLv3",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "language-livecode",`
`3`		`- "version": "0.5.1",`
	`3`	`+ "version": "0.6.0",`
`4`	`4`	`"description": "Support for editing LiveCode source code",`
`5`	`5`	`"repository": "https://github.com/peter-b/atom-language-livecode",`
`6`	`6`	`"license": "GPLv3",`