summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-07-09 14:11:07 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-07-09 14:11:07 +0200
commit9033aee6c281674e5d3d64e2f07bd8f7e7bbe694 (patch)
treea8748b55127d6be88e4b71b1dddf5985daac6a94 /.gitignore
parentb84c8622d092fd773888eed89f1dbffb2c3a57f7 (diff)
parentcb4fdfae7c68f6f4eef5893769f4b885bcb48186 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index d8537d7..a768d50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,4 +36,3 @@ Makefile.in
# project specific
build/*
-.pc