[SCM] rosegarden/master: Merge tag 'upstream/15.10.1'

[stuart at users.alioth.debian.org]

Imported Upstream version 15.10.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: 273c2a96ef38d3428d0b00efd10aac5d5ab1a7fd
X-Git-Newrev: de8808e9823f4413877527c31bf696aa5db85730

The following commit has been merged in the master branch:
commit e859070295f36febdbcd2e683eed6246f4d88341
Merge: 273c2a96ef38d3428d0b00efd10aac5d5ab1a7fd b3a28df5179bffb6556e23fefd39a5f05fd7e990
Author: Stuart Prescott <stuart at debian.org>
Date:   Sun Oct 25 23:33:56 2015 +1100

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

diff --combined .gitignore
index b408e6c,ea3bd7a..c293ff3
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,20 +1,21 @@@
- /.pc
++.pc
+ aclocal.m4
+ autom4te.cache
+ config.log
+ config.status
+ configure
+ dependencies
+ dependencies.bak
+ Makefile
+ rosegarden
+ .cproject
+ .project
+ .settings
+ .svn
+ *.moc
+ *.o
+ *.qm
+ src/gui/dialogs/RosegardenTransportUi.h
+ src/gui/studio/DeviceManagerDialogUi.h
+ data/data.cpp
+ 

-- 
rosegarden packaging