Merge branch 'master' of github.com:mdibaiee/rust-shell

Conflicts: .gitignore
2015-05-02 18:02:51 +04:30
parent f2add05547 5301fdbe1b
commit f539e4c8f1
2 changed files with 34 additions and 0 deletions
@@ -1 +1,13 @@
 target
+=======
+# Compiled files
+*.o
+*.so
+*.rlib
+*.dll
+
+# Executables
+*.exe
+
+# Generated by Cargo
+/target/