[Mesa-dev] [ANNOUNCE] Mesa 17.3.7 release candidate

[Juan A. Suarez Romero]

On Fri, 2018-03-16 at 12:07 +0000, Daniel Stone wrote:
> Hi Juan,
> 
> On 16 March 2018 at 11:42, Juan A. Suarez Romero <jasuarez at igalia.com> wrote:
> > Trivial merge conflicts
> > -----------------------
> > 
> > [...]
> > 
> > commit 5fd11359b66c8138d2c7ee29bd9740280b02d1e2
> > Author: Daniel Stone <daniels at collabora.com>
> > 
> >     egl/wayland: Fix ARGB/XRGB transposition in config map
> > 
> >     (cherry picked from commit 4fbd2d50b1c06a3c10f3a254e933646345123751)
> 
> This commit isn't in the 17.3 branch; was it rebased into another commit?
> 


Oh, apologies. I think I've committed a mistake when writing the email.

The commitid is wrong, the good one is:


commit 2e043c9bcf0182bb631a9ed0c4562775106cd1db
Author: Daniel Stone <daniels at collabora.com>

    egl/wayland: Fix ARGB/XRGB transposition in config map

    (cherry picked from commit 4fbd2d50b1c06a3c10f3a254e933646345123751)



	J.A.


> Cheers,
> Daniel
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev