[SCM] jackd2/master: Merge tag 'upstream/1.9.9.5+20140404git3d7c67dc_dfsg'

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

Imported Upstream version 1.9.9.5+20140404git3d7c67dc~dfsg
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c3aec90a15c835c7c69eaea6d57b0293e2f22ed0
X-Git-Newrev: cb5f1d93771b48b9fccdfe07f904628a457d37e0

The following commit has been merged in the master branch:
commit f448deba649654dbbcbda275e407ee9c7edd6de6
Merge: c3aec90a15c835c7c69eaea6d57b0293e2f22ed0 17a9a326bcc4dfc33c56f9e109bd29d3cd6001be
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Fri Apr 4 13:40:13 2014 +0200

    Merge tag 'upstream/1.9.9.5+20140404git3d7c67dc_dfsg'
    
    Upstream version 1.9.9.5+20140404git3d7c67dc~dfsg
    
    # gpg: Signature made Fri 04 Apr 2014 01:40:05 PM CEST using RSA key ID 2F52107F
    # gpg: Good signature from "Adrian Knoth <adi at drcomp.erfurt.thur.de>"

diff --combined .gitignore
index 642a459,8b2d4c4..1f033a0
--- a/.gitignore
+++ b/.gitignore
@@@ -1,5 -1,7 +1,8 @@@
 +/.pc
  build/
  man/*.1
  .waf*
  .lock*
+ android/.server/
+ android/.client/
+ codeBlocks

-- 
jackd2 packaging