Merge branch 'beta' into beta-backport

openethereum · Jan 5, 2018 · e6fda60 · e6fda60
2 parents 290668d + 364bf48
commit e6fda60
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 30 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Parity Ethereum client"
 name = "parity"
-version = "1.8.5"
+version = "1.8.6"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"

diff --git a/mac/Parity.pkgproj b/mac/Parity.pkgproj
@@ -462,7 +462,7 @@
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.8.5</string>
+				<string>1.8.6</string>
 			</dict>
 			<key>UUID</key>
 			<string>2DCD5B81-7BAF-4DA1-9251-6274B089FD36</string>

diff --git a/nsis/installer.nsi b/nsis/installer.nsi
@@ -10,7 +10,7 @@
 !define DESCRIPTION "Fast, light, robust Ethereum implementation"
 !define VERSIONMAJOR 1
 !define VERSIONMINOR 8
-!define VERSIONBUILD 5
+!define VERSIONBUILD 6
 !define ARGS ""
 !define FIRST_START_ARGS "--mode=passive ui"
 

diff --git a/util/Cargo.toml b/util/Cargo.toml
@@ -3,7 +3,7 @@ description = "Ethcore utility library"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-util"
-version = "1.8.5"
+version = "1.8.6"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"