aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorvmaffione <[email protected]>2017-01-24 15:15:07 +0000
committervmaffione <[email protected]>2017-01-24 15:15:07 +0000
commit2a085b29e2754500e87cbb1a90e89301671eabe8 (patch)
tree0f4cca29dd5bd4236122be280c53c6a34ced12fe /.gitignore
parente184e2838cc2b65fe9afe1cf7649b01ce4dcf73f (diff)
parent97e601fdc5c03de7c643c855228b83419394f728 (diff)
downloadrumba-2a085b29e2754500e87cbb1a90e89301671eabe8.tar.gz
rumba-2a085b29e2754500e87cbb1a90e89301671eabe8.zip
Merge branch 'master-sander' into 'master'
rhumba: Add emulab support See merge request !3
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore6
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 72364f9..146de1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,3 +87,9 @@ ENV/
# Rope project settings
.ropeproject
+
+# emacs temporary files
+*~
+
+*rspec
+*.pem