summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-10-01 20:19:42 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-10-01 20:19:42 +0200
commitb8757ee40b25ad8dac375c35f23785982985c215 (patch)
tree6ede28c8add650f5fcef3c920de66da2e0cd7c80 /.gitignore
parent775e974b25e1c055ecaba84c50e1fed12e57a82d (diff)
parent9a955c414e34de441b5f188520314d54e3c5b3c5 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 4ccd411..91ef9c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,4 @@
/*.txt
*~
*.pyc
-
+.pc