Merge Update_to_2.12.0 into master

NodeOS-bot · web-flow · commit 9db80d1a90ae · 2018-04-25T02:09:03.000+02:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "qemu",
-  "version": "2.11.1",
+  "version": "2.12.0",
   "description": "QEmu as a npm package for NodeOS",
   "bin": {
     "ivshmem-client": "bin/ivshmem-client",
@@ -57,4 +57,4 @@
     "type": "DirectoryIndex",
     "url": "https://download.qemu.org/"
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "qemu",`
`3`		`- "version": "2.11.1",`
	`3`	`+ "version": "2.12.0",`
`4`	`4`	`"description": "QEmu as a npm package for NodeOS",`
`5`	`5`	`"bin": {`
`6`	`6`	`"ivshmem-client": "bin/ivshmem-client",`
`@@ -57,4 +57,4 @@`
`57`	`57`	`"type": "DirectoryIndex",`
`58`	`58`	`"url": "https://download.qemu.org/"`
`59`	`59`	`}`
`60`		`-}`
	`60`	`+}`