grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge master into sms-verification-modal

Browse Source
This commit is contained in:
Jannis R 2016-11-14 16:00:16 +01:00
commit 9df0d33709
No known key found for this signature in database
GPG Key ID: 0FE83946296A88A5
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -1249,7 +1249,7 @@ dependencies = [
[[package]] [[package]]
name = "parity-ui-precompiled" name = "parity-ui-precompiled"
version = "1.4.0" version = "1.4.0"
source = "git+https://github.com/ethcore/js-precompiled.git#bf33dd4aabd2adb2178576db5a4d23b8902d39b8" source = "git+https://github.com/ethcore/js-precompiled.git#7bf550e482ef274480d1fd7e1ceb2efddd747dbd"
dependencies = [ dependencies = [
"parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]

2
js/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "parity.js", "name": "parity.js",
"version": "0.2.37", "version": "0.2.38",
"main": "release/index.js", "main": "release/index.js",
"jsnext:main": "src/index.js", "jsnext:main": "src/index.js",
"author": "Parity Team <admin@parity.io>", "author": "Parity Team <admin@parity.io>",

2
util/benches/bigint.rs
View File

@ -24,7 +24,7 @@
#![feature(asm)] #![feature(asm)]
extern crate test; extern crate test;
extern crate bigint; extern crate ethcore_bigint as bigint;
use test::{Bencher, black_box}; use test::{Bencher, black_box};
use bigint::uint::{U256, U512, Uint, U128}; use bigint::uint::{U256, U512, Uint, U128};

7
util/benches/rlp.rs
View File

@ -23,12 +23,13 @@
#![feature(test)] #![feature(test)]
extern crate test; extern crate test;
extern crate ethcore_util; extern crate rlp;
extern crate ethcore_bigint as bigint;
use test::Bencher; use test::Bencher;
use std::str::FromStr; use std::str::FromStr;
use ethcore_util::rlp::*; use rlp::*;
use ethcore_util::U256; use bigint::uint::U256;
#[bench] #[bench]
fn bench_stream_u64_value(b: &mut Bencher) { fn bench_stream_u64_value(b: &mut Bencher) {