<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">2014-06-04 15:30 GMT+02:00  <span dir="ltr"><<a href="mailto:mira-guest@users.alioth.debian.org" target="_blank">mira-guest@users.alioth.debian.org</a>></span>:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Imported Upstream version 0.5~repack0<br>
<div class="">MIME-Version: 1.0<br>
Content-Type: text/plain; charset=UTF-8<br>
X-Git-Refname: refs/heads/master<br>
X-Git-Reftype: branch<br>
</div>X-Git-Oldrev: 092101909e018b29f721a47a0bac6aff5ae18cb4<br>
X-Git-Newrev: 51df561bd4be88fb03f87924fc106ff3500fa347<br>
<div class=""><br>
The following commit has been merged in the master branch:<br>
</div>commit 51df561bd4be88fb03f87924fc106ff3500fa347<br>
Merge: 092101909e018b29f721a47a0bac6aff5ae18cb4 9dd266f1bd0884a952040cf891c76894ab76a053<br>
Author: Jaromír Mikeš <<a href="mailto:mira.mikes@seznam.cz">mira.mikes@seznam.cz</a>><br>
Date:   Wed Jun 4 15:29:56 2014 +0200<br>
<br>
    Resolve merge.<br>
<span class=""><font color="#888888"><br>
<br>
--<br>
faustworks packaging<br>
<br>
</font></span><br>_______________________________________________<br>
pkg-multimedia-commits mailing list<br>
<a href="mailto:pkg-multimedia-commits@lists.alioth.debian.org">pkg-multimedia-commits@lists.alioth.debian.org</a><br>
<a href="http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-commits" target="_blank">http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-commits</a><br></blockquote></div><br><br></div>
<div class="gmail_extra">Hello,<br><br></div><div class="gmail_extra">can someone help me resolve merge in faustworks repo?<br>I think the only problem is that file faustworks/Makefile_QT should be deleted.<br><br></div><div class="gmail_extra">
thank you for help<br><br></div><div class="gmail_extra">mira<br></div></div>