summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorPhilip Häusler <msquare@notrademark.de>2012-12-27 03:04:54 +0100
committerPhilip Häusler <msquare@notrademark.de>2012-12-27 03:04:54 +0100
commitcaeadadb2734bfc537d3e1701b2a20cad233a07e (patch)
treee0606c6eb37707b372e65cf1c5f6243254eb94fe /.gitignore
parent32cae74a585ecc074124aa5b9668b9f0a25a2ad5 (diff)
parent0f0f847af4c9ffe8138c802086bda7eb15f9baef (diff)
Merge branch 'dev'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index e30374fe..463fa802 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ includes_old
www-ssl_old
.project
.buildpath
+.*.swp
+_vimrc_local.vim