patchreview.cpp diverged in master/movingranges

[Milian Wolff]

Hey there,

David - could it be that you changes patchreview in movingranges branch? Apol 
changes something in master as well and they differ now. I'm not confident to 
solve the conflict that is created from that. There are some more conflicts in 
vcs/* that I didn't even look at.

Can someone resolve that?

I can resolve the conflict in codehighlighting and the CMakeLists.txt

Bye
-- 
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/20100820/3e53b02b/attachment.sig>