Merge Update_to_2.7.0 into master

piranna · web-flow · commit df64e871a348 · 2016-12-04T01:06:26.000+01:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "qemu",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "description": "QEmu as a npm package for NodeOS",
   "bin": {
     "ivshmem-client": "bin/ivshmem-client",
@@ -55,4 +55,4 @@
     "type": "DirectoryIndex",
     "url": "http://wiki.qemu-project.org/download/"
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "qemu",`
`3`		`- "version": "2.6.0",`
	`3`	`+ "version": "2.7.0",`
`4`	`4`	`"description": "QEmu as a npm package for NodeOS",`
`5`	`5`	`"bin": {`
`6`	`6`	`"ivshmem-client": "bin/ivshmem-client",`
`@@ -55,4 +55,4 @@`
`55`	`55`	`"type": "DirectoryIndex",`
`56`	`56`	`"url": "http://wiki.qemu-project.org/download/"`
`57`	`57`	`}`
`58`		`-}`
	`58`	`+}`