1.2 branch needs merging

[Aleix Pol]

On Mon, Jan 10, 2011 at 2:19 PM, Andreas Pakulat <apaku at gmx.de> wrote:

> Hi,
>
> seems like nobody merged 1.2 into master since almost 2 weeks, this is bad
> because there have been build-fixes to 1.2 in that timespan and master
> currently fails to build for a couple of people. I would've done it but I
> can't build master here and there have been conflicts I don't have a clue
> about.
>
> Andreas
>
> --
> Today's weirdness is tomorrow's reason why.
>                -- Hunter S. Thompson
>
> --
> KDevelop-devel mailing list
> KDevelop-devel at kdevelop.org
> https://barney.cs.uni-potsdam.de/mailman/listinfo/kdevelop-devel
>

I'll do that now.

Aleix
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kdevelop-devel/attachments/20110110/b4ccdf1e/attachment.html>