[cogl] (8 commits) Non-fast-forward update to branch cogl.windows.fixes

[Chun-wei Fan <fanchunwei src gnome org>]

The branch 'cogl.windows.fixes' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  72abd12... wayland: do not require wl_shell
  e02210f... Update French translation
  eb2166d... cogl-winsys-sdl2.c: Fix running on 32-bit Windows
  e70738e... cogl/cogl.c: Do not hardcode COGL_LOCALEDIR on Windows
  c9e69eb... cogl/cogl-bitmask.h: Use size_t instead of unsigned long
  a42db00... cogl-crate.c: Fix running on 64-bit Windows
  b9d2ddb... cogl/cogl-debug.h: Export and properly use extern variables

Commits added to the branch:

  3809e7b... wayland: do not require wl_shell (*)
  b6039b5... Merge branch 'cogl-1.22' into 'cogl-1.22' (*)
  b0f92ef... Update French translation (*)
  4c0299a... cogl-winsys-sdl2.c: Fix running on 32-bit Windows
  2fff65e... cogl/cogl.c: Do not hardcode COGL_LOCALEDIR on Windows
  b9ee85d... cogl/cogl-bitmask.h: Use size_t instead of unsigned long
  f99994e... cogl-crate.c: Fix running on 64-bit Windows
  bbc97b4... cogl/cogl-debug.h: Export and properly use extern variables

(*) This commit already existed in another branch; no separate mail sent