Commit Graph

1828 Commits

Author SHA1 Message Date
Nikolay Volf 84e7ce2758 Merge branch 'master' into temp-path
Conflicts:
	util/Cargo.toml
	util/src/lib.rs
2016-02-19 19:11:24 +03:00
Nikolay Volf ab0fe65f3f unlisting as dev-dependencies 2016-02-19 18:09:31 +03:00
arkpar 2f62994f61 Updated cargo.lock 2016-02-19 15:17:31 +01:00
arkpar f15275bb5b Merge branch 'master' of github.com:ethcore/parity into db 2016-02-19 13:52:07 +01:00
arkpar d9fec87143 Merge branch 'master' of github.com:ethcore/parity into discovery 2016-02-19 13:39:43 +01:00
debris 19a3daf533 parity compiling fine 2016-02-19 00:50:23 +01:00
debris df3d17789a compiling ethcore on beta 2016-02-19 00:06:06 +01:00
arkpar af8ba06795 utils compilable in beta 2016-02-18 23:29:41 +01:00
arkpar e0623f57f9 Merge branch 'master' of github.com:ethcore/parity into discovery 2016-02-18 21:49:11 +01:00
Gav Wood 8e93989eec Merge branch 'rustup' into rustbeta 2016-02-18 21:09:36 +01:00
Gav Wood ae2ef83f16 Merge branch 'clippy_optional' of https://github.com/Manishearth/parity into Manishearth-clippy_optional 2016-02-18 20:59:28 +01:00
Nikolay Volf 031b15daab update cargo.lock 2016-02-18 22:12:25 +03:00
Nikolay Volf 8b4278aeaa feature dep for heapsize 2016-02-18 22:06:59 +03:00
Nikolay Volf 198119466b forking heapsize 2016-02-18 19:21:24 +03:00
debris 80f4f422fc updated heapsizeof 2016-02-18 15:17:26 +01:00
debris ebe8e19cc0 fixed compiling with rustc 1.8.0-nightly (57c357d89 2016-02-16) 2016-02-18 14:36:59 +01:00
Gav Wood 97f549cf5f Add daemonization. 2016-02-18 12:42:01 +01:00
arkpar 68d606b5f0 rocksdb abstraction layer 2016-02-18 03:46:24 +01:00
Nikolay Volf 0b916e0a51 Merge branch 'master' into discovery 2016-02-17 03:21:41 +03:00
Manish Goregaokar 8802fb2fd8 Make clippy an optional dependency 2016-02-17 02:07:41 +05:30
Nikolay Volf feb9b96ce7 version bump, test script for full suite 2016-02-16 13:40:58 +03:00
arkpar c5ca293d72 Merge branch 'master' of github.com:ethcore/parity into discovery 2016-02-16 02:31:31 +01:00
arkpar 203947388b Get public address/UPNP refactoring 2016-02-16 02:05:36 +01:00
Nikolay Volf 29980d3e96 travis fix 2016-02-16 01:07:39 +03:00
debris 874dcdd840 back to cargo crates 2016-02-15 10:47:56 +01:00
Nikolay Volf 304173f595 preserving root cargo lock 2016-02-14 19:35:45 +03:00
Gav Wood ceaf6910c1 Upate metadata. 2015-11-24 21:27:10 +01:00
Gav Wood 950f1f898b Change to library. 2015-11-24 21:05:08 +01:00