Hi Juan, On 16 March 2018 at 11:42, Juan A. Suarez Romero <jasua...@igalia.com> wrote: > Trivial merge conflicts > ----------------------- > > [...] > > commit 5fd11359b66c8138d2c7ee29bd9740280b02d1e2 > Author: Daniel Stone <dani...@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? Cheers, Daniel _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
