[Development] Qt 3D 5.7 -> 5.7.1 missing merge

[Kevin Ottens]

Hello,

On Friday, 7 October 2016 10:30:20 CEST Oswald Buddenhagen wrote:
> On Fri, Oct 07, 2016 at 10:10:39AM +0200, Kevin Ottens wrote:
> > I found out yesterday that some patches of the 5.7 branch are not in
> > 5.7.1.
> 
> i see no evidence of this being true at this time.

Ah, I see, it happened between the time I checked and the time this email 
finally got off my queue.
 
> > Those patches were produced in 5.7 because we were expecting a final
> > 5.7 -> 5.7.1 merge.
> 
> given that there was not even a mail announcing the completion of said
> merge yet, what makes you think there is some problem?

Indeed now that I could finally pull it sorted itself out. I expected that 
merge to happen earlier than it did happen though, hence the confusion.

Regards.
-- 
Dr. Kevin Ottens | kevin.ottens at kdab.com | Software Craftsman
KDAB (France) S.A.S., a KDAB Group company
Tel. France +33 (0)4 90 84 08 53, http://www.kdab.fr
KDAB - The Qt Experts
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 4661 bytes
Desc: not available
URL: <http://lists.qt-project.org/pipermail/development/attachments/20161007/501b6a52/attachment.bin>