Merge commit '051bc08d23df0930be5e959645c50dd0cdf411d4'

2017-08-29 07:12:47 -07:00
parent 344fbed77a 051bc08d23
commit 8f6957296e
685 changed files with 59063 additions and 9 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,11 @@
-# Generated by Cargo
-# will have compiled files and executables
-/target/
-
-# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
-# More information here http://doc.crates.io/guide.html#cargotoml-vs-cargolock
-Cargo.lock
-
-# These are backup files generated by rustfmt
+*.pyc
 **/*.rs.bk
+*.swp
+*.swo
+tags
+/target/
+Cargo.lock
+.*.rustfmt
+cretonne.dbg*
+.mypy_cache
+rusty-tags.*