[SCM] ardour3/master: Merge tag 'upstream/3.3_dfsg'

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

Imported Upstream version 3.3~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: bc9ab38db24ac2f43ace6af8995a334fab2ead01
X-Git-Newrev: 258ff06103add7bec57bf7b3dc0a8b72fcaf065c

The following commit has been merged in the master branch:
commit f59279aaacf95eb649068aa53e1a9a85ac32aa49
Merge: 77938ee587c4e80d5af1ee83289cfa9412c4b3e5 0ff065a78beb13070fb361a7f59b97583eaff8a4
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Thu Aug 8 13:48:00 2013 +0200

    Merge tag 'upstream/3.3_dfsg'
    
    Upstream version 3.3~dfsg
    
    # gpg: Signature made Thu 08 Aug 2013 01:47:55 PM CEST using RSA key ID 2F52107F
    # gpg: Good signature from "Adrian Knoth <adi at drcomp.erfurt.thur.de>"

diff --combined .gitignore
index 9d78e81,f2251ba..a92f245
--- a/.gitignore
+++ b/.gitignore
@@@ -1,8 -1,6 +1,7 @@@
 +/.pc
  *.[oa]
  *.o
  *.os
- *.template
  *.binding
  *.so
  *.dylib

-- 
ardour3 packaging