3b3226b678
Conflicts: src/compositor/mutter/compositor-mutter.c src/core/window.c |
||
---|---|---|
.. | ||
mutter | ||
compositor-private.h | ||
compositor-xrender.c | ||
compositor-xrender.h | ||
compositor.c |
3b3226b678
Conflicts: src/compositor/mutter/compositor-mutter.c src/core/window.c |
||
---|---|---|
.. | ||
mutter | ||
compositor-private.h | ||
compositor-xrender.c | ||
compositor-xrender.h | ||
compositor.c |