Merge pull request #445 from ethcore/beta-patched

Beta patch to 0.9.1
openethereum · Feb 16, 2016 · f7ce931 · f7ce931
2 parents 4cfb7a2 + 50f17c3
commit f7ce931
Show file tree

Hide file tree

Showing 29 changed files with 881 additions and 97 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,11 +7,12 @@
 # Executables
 *.exe
 
-Cargo.lock
-
 # Generated by Cargo
 **/target/
 
+# libs cargo lock
+/*/Cargo.lock
+
 # vim stuff
 *.swp
 
@@ -24,4 +25,4 @@ Cargo.lock
 /json-tests/target/
 
 # jetbrains ide stuff
-.idea
+.idea