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

Merge branch 'master' into ethminer_crate

Browse Source 
Conflicts:
	util/bigint/src/uint.rs
This commit is contained in:
Tomasz Drwięga 2016-03-11 16:24:52 +01:00
commit 9f19d2993c
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -34,9 +34,6 @@ Then, download and build Parity:
git clone https://github.com/ethcore/parity git clone https://github.com/ethcore/parity
cd parity cd parity
# parity should be built with rust beta
multirust override beta
# build in release mode # build in release mode
cargo build --release cargo build --release
``` ```

1
util/bigint/src/uint.rs
View File

@ -36,6 +36,7 @@
//! The functions here are designed to be fast. //! The functions here are designed to be fast.
//! //!
#[cfg(all(asm_available, target_arch="x86_64"))]
use std::mem; use std::mem;
use std::fmt; use std::fmt;
use std::cmp; use std::cmp;