On Monday, 31 de January de 2011 16:05:43 Aaron J. Seigo wrote: > this was before i did any cherry-picks myself, but perhaps others had > already beat me to it. in any case, is there a way to fix it so that the > 4.6 branch would become mergeable with master, or do we now basically just > have to wait for a 4.7 branch?
Fix all the conflicts. After that, merging should work.
--
Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org
Senior Product Manager - Nokia, Qt Development Frameworks
PGP/GPG: 0x6EF45358; fingerprint:
E067 918B B660 DBD1 105C 966C 33F5 F005 6EF4 5358
signature.asc
Description: This is a digitally signed message part.
