[SCM] faustworks/master: Resolve merge.

[Jaromír Mikeš]

2014-06-04 15:30 GMT+02:00 <mira-guest at users.alioth.debian.org>:

> Imported Upstream version 0.5~repack0
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> X-Git-Refname: refs/heads/master
> X-Git-Reftype: branch
> X-Git-Oldrev: 092101909e018b29f721a47a0bac6aff5ae18cb4
> X-Git-Newrev: 51df561bd4be88fb03f87924fc106ff3500fa347
>
> The following commit has been merged in the master branch:
> commit 51df561bd4be88fb03f87924fc106ff3500fa347
> Merge: 092101909e018b29f721a47a0bac6aff5ae18cb4
> 9dd266f1bd0884a952040cf891c76894ab76a053
> Author: Jaromír Mikeš <mira.mikes at seznam.cz>
> Date:   Wed Jun 4 15:29:56 2014 +0200
>
>     Resolve merge.
>
>
> --
> faustworks packaging
>
>
> _______________________________________________
> pkg-multimedia-commits mailing list
> pkg-multimedia-commits at lists.alioth.debian.org
>
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-commits
>


Hello,

can someone help me resolve merge in faustworks repo?
I think the only problem is that file faustworks/Makefile_QT should be
deleted.

thank you for help

mira
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/attachments/20140605/f9c9bd45/attachment.html>