mirror of
https://github.com/brl/mutter.git
synced 2025-02-02 14:53:03 +00:00
Robert Bragg
0c8c273980
Merge commit 'origin/master' into cogl-material
Conflicts: clutter/clutter-texture.c clutter/cogl/cogl-texture.h clutter/cogl/cogl.h.in clutter/cogl/common/Makefile.am clutter/cogl/gl/Makefile.am clutter/cogl/gles/Makefile.am clutter/cogl/gles/cogl-gles2-wrapper.c clutter/cogl/gles/cogl-gles2-wrapper.h
Description
Languages
C
98.9%
Meson
0.7%
Python
0.3%