[SCM] gxtuner/master: Merge.

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

Imported Upstream version 2.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2d63aa1ed10cb31c52fd9292c997e3e109786a43
X-Git-Newrev: c6c686a00f3f2d9365ca3e0a4d505dfd0be6b411

The following commit has been merged in the master branch:
commit c6c686a00f3f2d9365ca3e0a4d505dfd0be6b411
Merge: 2d63aa1ed10cb31c52fd9292c997e3e109786a43 e2cfee207575ea88438c26600cdf494b7109e08c
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Jul 26 09:28:44 2016 +0200

    Merge.

diff --combined .gitignore
index 224e7f0,7a3168e..63a61d8
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,4 +1,8 @@@
++<<<<<<< HEAD
 +.pc/
++=======
+ *.o
+ config.h
+ resample.h
+ gxtuner
++>>>>>>> upstream/2.2

-- 
gxtuner packaging