kdevplatform/kdevelop master branches broken!! [Re: unittests branch merged]

[Milian Wolff]

On Saturday 27 October 2012 00:59:32 Aleix Pol wrote:
> Hi!
> Good news from Vienna again, we decided to merge the unit test support
> from Miha's branch to master, so that we can polish it for the next
> KDevelop version. Let's make it rock! :)

Bad news: this merge completely reverted the work of the last weeks in 
kdevplatform and also some essential commits in kdevelop - please stay tuned 
until we sort this mess out :(

@Miha and the rest: If you merge master into your feature branch and get 
strange unrelated conflicts... don't just blindly do stuff but actually figure 
out whats going on there... sigh
-- 
Milian Wolff
mail at milianw.de
http://milianw.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kdevelop-devel/attachments/20121027/39eb5e1c/attachment.sig>