[SCM] amsynth/master: Merge tag 'upstream/1.6.4'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.6.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 9fe84a408194815bc3ba4fd3693863eb47c796ae
X-Git-Newrev: 4ed5fc55e1b0ab55df0569fc1b3dab4aa1e6a420

The following commit has been merged in the master branch:
commit e160c97b606c3f38c1ea86e3705dd011c3620f2c
Merge: 9fe84a408194815bc3ba4fd3693863eb47c796ae 7b20a4a0adc1167f38eeadd500b564dd11a6a0da
Author: Alessio Treglia <alessio.treglia at smartodds.co.uk>
Date:   Fri Jan 22 22:29:38 2016 +0000

    Merge tag 'upstream/1.6.4'
    
    Upstream version 1.6.4

diff --combined .gitignore
index 6fd6940,4d3f37b..c5f8de4
--- a/.gitignore
+++ b/.gitignore
@@@ -1,8 -1,21 +1,21 @@@
  *.a
+ *.in
+ *.la
+ *.lo
+ *.o
+ *.swp
+ *.tar.gz
+ *~
+ .deps
+ .dirstamp
+ .libs
  aclocal.m4
+ amsynth
  amsynth.desktop
+ amsynth_dssi_gtk
  autom4te.cache
- autopackage/default.apspec
+ build
+ compile
  config.guess
  config.h
  config.log
@@@ -10,25 -23,10 +23,11 @@@ config.statu
  config.sub
  configure
  depcomp
- .deps
- *.in
+ INSTALL
  install-sh
  libtool
  ltmain.sh
  Makefile
  missing
- *.o
- *.lo
- *.la
- *.tar.gz
- .libs
- src/amsynth
- src/amsynth_dssi_gtk
  stamp-h1
- *.swp
- *~
- 
- compile
- build
- /INSTALL
 +.pc

-- 
amsynth packaging