Merge pull request #434 from ethcore/cargo-lock

preserving root cargo lock
openethereum · Feb 14, 2016 · 5b6e47c · 5b6e47c
2 parents c1ab00d + 3c82e48
commit 5b6e47c
Show file tree

Hide file tree

Showing 3 changed files with 811 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,8 @@
 # Executables
 *.exe
 
-Cargo.lock
+# Cargo lock in subs
+**/Cargo.lock
 
 # Generated by Cargo
 **/target/
@@ -24,4 +25,4 @@ Cargo.lock
 /json-tests/target/
 
 # jetbrains ide stuff
-.idea
+.idea