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

[stuart at users.alioth.debian.org]

New upstream version 17.04
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0c7daeeaaacb35eb9d7696c9f518f3d5c435490d
X-Git-Newrev: ca355b56dcef0e79487de04ff67712f2e99f9ad8

The following commit has been merged in the master branch:
commit 67b202dce92ede340f05078c21806daf10c63353
Merge: 3ecad1915b3163c1318afa241be2f3b1208f1473 0f1a8987d13a953a4414471ccc5cb456b164049f
Author: Stuart Prescott <stuart at debian.org>
Date:   Tue Jun 20 19:40:01 2017 +1000

    Merge tag 'upstream/17.04'
    
    Upstream version 17.04
    
    # gpg: Signature made Tue 20 Jun 2017 19:39:55 AEST
    # gpg:                using RSA key 90E2D2C1AD146A1B7EBB891DBBC17EBB1396F2F7
    # gpg: Good signature from "Stuart Prescott <stuart at nanonanonano.net>" [ultimate]
    # gpg:                 aka "Stuart Prescott <stuart+debian at nanonanonano.net>" [ultimate]
    # gpg:                 aka "Stuart Prescott <stuart at debian.org>" [ultimate]

diff --combined .gitignore
index fba3a65,30896e2..420a0ac
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,3 +1,4 @@@
 +.pc
  aclocal.m4
  autom4te.cache
  build
@@@ -18,5 -17,7 +18,7 @@@ rosegarde
  *.qm
  src/gui/dialogs/RosegardenTransportUi.h
  src/gui/studio/DeviceManagerDialogUi.h
- data/data.cpp
+ data/AutoloadStrings.cpp
+ data/InstrumentStrings.cpp
+ data/QMenuStrings.cpp
  

-- 
rosegarden packaging