1 files changed, 26 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 188ff005d..706d953bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,27 @@
-venv/
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile ~/.gitignore_global
+
+/tmp
+*/**/*un~
+*/**/*.test
+*un~
+.DS_Store
+*/**/.DS_Store
+.ethtest
+*/**/*tx_database*
+*/**/*dapps*
+
+#*
+.#*
+*#
 *~
-*.sw?
-.vagrant/
-*.pem
+.project
+.settings
+
+cmd/ethereum/ethereum
+cmd/mist/mist
+deploy/osx/Mist.app
+deploy/osx/Mist\ Installer.dmg