mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-26 10:10:32 +00:00
c04aba241e
This fixes conflict resolution error introduced in commit:
|
||
---|---|---|
.. | ||
.gitignore | ||
gstwaylandsink.c | ||
gstwaylandsink.h | ||
Makefile.am | ||
meson.build | ||
wlbuffer.c | ||
wlbuffer.h | ||
wldisplay.c | ||
wldisplay.h | ||
wllinuxdmabuf.c | ||
wllinuxdmabuf.h | ||
wlshmallocator.c | ||
wlshmallocator.h | ||
wlvideoformat.c | ||
wlvideoformat.h | ||
wlwindow.c | ||
wlwindow.h |