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

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit df4eefb989a38b174d0d0569bb9095660ab172da
Merge: 40b939f097ce0a15886f866b087db33037df1a99 521a578f3284bd4b7ec0d96a0b38b1f7b4e2707e
Author: Alessio Treglia <alessio.treglia at smartodds.co.uk>
Date:   Sun May 10 14:05:10 2015 +0100

    Merge tag 'upstream/1.5.1'
    
    Upstream version 1.5.1
    
    Conflicts:
    	.gitignore

diff --combined .gitignore
index 845ca06,fcd421c..6fd6940
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,33 +1,34 @@@
+ *.a
+ aclocal.m4
+ amsynth.desktop
+ autom4te.cache
+ autopackage/default.apspec
+ config.guess
+ config.h
+ config.log
+ config.status
+ config.sub
+ configure
+ depcomp
+ .deps
+ *.in
+ 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