diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-07-09 14:11:07 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-07-09 14:11:07 +0200 |
commit | 9033aee6c281674e5d3d64e2f07bd8f7e7bbe694 (patch) | |
tree | a8748b55127d6be88e4b71b1dddf5985daac6a94 /.gitignore | |
parent | b84c8622d092fd773888eed89f1dbffb2c3a57f7 (diff) | |
parent | cb4fdfae7c68f6f4eef5893769f4b885bcb48186 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -36,4 +36,3 @@ Makefile.in # project specific build/* -.pc |