[cogl/cogl-1.22: 2/2] Merge branch 'cogl-1.22' into 'cogl-1.22'

[Emmanuele Bassi <ebassi src gnome org>]

commit b6039b5cf67844d535eb63eeb0e41f55f11602c6
Merge: 19eba3a7 3809e7b3
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Thu Feb 7 13:27:59 2019 +0000

    Merge branch 'cogl-1.22' into 'cogl-1.22'
    
    wayland: do not require wl_shell
    
    See merge request GNOME/cogl!4

 cogl/winsys/cogl-winsys-egl-wayland.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)
---