summaryrefslogtreecommitdiffhomepage
path: root/.gitignore
diff options
context:
space:
mode:
authorkocsv <kocsv@local>2017-05-16 10:18:46 +0200
committerkocsv <kocsv@local>2017-05-16 10:18:46 +0200
commit82e4dc80f5838efcb08ac1c89f58a324b2a26409 (patch)
treef1f28bf0e1ad1fdcee4b2f87f34d9aa169080a5a /.gitignore
parentaacc3bb2b563cd172e340365b8f14ec8fae32d9d (diff)
parenta9ddb1242181032c549bcac7341e38cb2ee0bb73 (diff)
Merge https://github.com/opentrack/opentrack into unstable
merge from upstream
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index dcc05569..cf0abe36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,4 @@
*.obj
*.exp
*.pdb
-
+/.idea/