Merge branch 'master' of github.com:ethcore/parity into beta

Set version to beta
2016-06-24 09:16:49 +02:00 · 2016-06-22 16:01:16 +02:00 · 2016-06-22 12:19:49 +02:00
1 changed files with 1 additions and 1 deletions
--- a/util/src/misc.rs
+++ b/util/src/misc.rs
@@ -49,7 +49,7 @@ pub fn version() -> String {
 	let date_dash = if commit_date.is_empty() { "" } else { "-" };
 	let env = Target::env();
 	let env_dash = if env.is_empty() { "" } else { "-" };
-	format!("Parity/v{}-unstable{}{}{}{}/{}-{}{}{}/rustc{}", env!("CARGO_PKG_VERSION"), sha3_dash, sha3, date_dash, commit_date, Target::arch(), Target::os(), env_dash, env, rustc_version())
+	format!("Parity/v{}-beta{}{}{}{}/{}-{}{}{}/rustc{}", env!("CARGO_PKG_VERSION"), sha3_dash, sha3, date_dash, commit_date, Target::arch(), Target::os(), env_dash, env, rustc_version())
 }

 /// Get the standard version data for this software.
Author	SHA1	Message	Date
arkpar	84ded6f43c	Merge branch 'master' of github.com:ethcore/parity into beta	2016-06-24 09:16:49 +02:00
arkpar	eafc1b153d	Merge branch 'master' of github.com:ethcore/parity into beta	2016-06-22 16:01:16 +02:00
arkpar	53b0862096	Set version to beta	2016-06-22 12:19:49 +02:00