Merge branch 'live' of ssh://ephesus.xvm.mit.edu/org/selectricity/selectricity-live

[selectricity] / .gitignore

diff --git a/.gitignore b/.gitignore
index 756e09a65416ca7f2b383d78a2a6ff2e562d917a..b231fb40c44abebe580ef48caa205b4682389410 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+*~
+*.swp
 database.yml
 tmp
 public/engine_files
@@ -7,3 +9,4 @@ public/pictures/*
 public/skin_pictures
 help
 log/*
+*~