[SCM] gxtuner/master: Merge.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3f88d8d4e88a2993a1869e257eae212615e05208
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Jul 26 10:11:20 2016 +0200

    Merge.

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 63a61d8..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-<<<<<<< HEAD
-.pc/
-=======
-*.o
-config.h
-resample.h
-gxtuner
->>>>>>> upstream/2.2

-- 
gxtuner packaging