Merge branch 'release/v0.6.0'

pc035860 · pc035860 · commit 8f72f66a4fd9 · 2016-02-13T10:29:51.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## v0.6.0
+
+- Publish to NPM ([#8](https://github.com/pc035860/angular-scroll-watch/issues/8))
+- Support browserify/webpack/requirejs with UMD
+
 ## v0.5.5
 
 - Fix `sw-stage` destroy issue ([#6](https://github.com/pc035860/angular-scroll-watch/issues/6))
diff --git a/build/angular-scroll-watch.js b/build/angular-scroll-watch.js
@@ -1,5 +1,5 @@
 /*! anguar-scroll-watch
-version: 0.5.5
+version: 0.6.0
 build date: 2016-2-13
 author: [object Object]
 https://github.com/pc035860/angular-scroll-watch.git */
diff --git a/build/angular-scroll-watch.min.js b/build/angular-scroll-watch.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "anguar-scroll-watch",
-  "version": "0.5.5",
+  "version": "0.6.0",
   "description": "Basic scroll-aware directives for AngularJS.",
   "main": "build/angular-scroll-watch.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "anguar-scroll-watch",`
`3`		`- "version": "0.5.5",`
	`3`	`+ "version": "0.6.0",`
`4`	`4`	`"description": "Basic scroll-aware directives for AngularJS.",`
`5`	`5`	`"main": "build/angular-scroll-watch.js",`
`6`	`6`	`"scripts": {`