Re: [xine-devel] Emit vzeroupper after avx memcpy

[Chris R. <ran...@ya...>]

Hi,


I've applied this patch to the xine-lib branch, but my attempts also to merge it across from there to the xine-lib-1.2 branch have instead mangled my local repository in ways I would not have believed possible...

Can someone (*cough* Darren?) share the appropriate "hg merge fu" please?

Cheers,
Chris