[SCM] gsequencer/upstream: Merge /home/joelkraehemann/repos/gsequencer into upstream

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

initial upstream v0.4.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/upstream
X-Git-Reftype: branch
X-Git-Oldrev: c031932f05a9dba5ead446cf7364029ff9efac44
X-Git-Newrev: 6fe8496fe3cdd2584f5012b6ef5a39b7746709c0

The following commit has been merged in the upstream branch:
commit c48aeea4312006365e3706830fae5d4c9efb2c3a
Merge: 8895175c67215573e9bf0ce06c1082da3592a6b9 c031932f05a9dba5ead446cf7364029ff9efac44
Author: Joël Krähemann <jkraehemann at gmail.com>
Date:   Sun Jun 14 13:53:25 2015 +0200

    Merge /home/joelkraehemann/repos/gsequencer into upstream
    
    Conflicts:
    	README

diff --combined README
index d87cbec,34018fe..208e9d3
--- a/README
+++ b/README
@@@ -1,5 -1,5 +1,11 @@@
  jkraehemann at gmail.com
  
++<<<<<<< HEAD
 +You need a realtime kernel in conjunction with ags in order to do more computing expensive synthesis.
 +
 +Please visit http://rt.wiki.kernel.org for more information.
++=======
+ You need a realtime kernel in conjunction with in order to do more computing expensive synthesis.
+ 
+ See http://rt.wiki.kernel.org/ for more information. 
++>>>>>>> c031932f05a9dba5ead446cf7364029ff9efac44

-- 
gsequencer packaging