30b516eceb
In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" |
||
---|---|---|
.. | ||
CMakeLists.txt | ||
edge.cpp | ||
edge.h | ||
effects_mouse_interception_x11_filter.cpp | ||
effects_mouse_interception_x11_filter.h | ||
effects_x11.cpp | ||
effects_x11.h | ||
glx_context_attribute_builder.cpp | ||
glx_context_attribute_builder.h | ||
glxbackend.cpp | ||
glxbackend.h | ||
logging.cpp | ||
logging.h | ||
non_composited_outline.cpp | ||
non_composited_outline.h | ||
overlaywindow_x11.cpp | ||
overlaywindow_x11.h | ||
screenedges_filter.cpp | ||
screenedges_filter.h | ||
screens_xrandr.cpp | ||
screens_xrandr.h | ||
windowselector.cpp | ||
windowselector.h | ||
x11.json | ||
x11_decoration_renderer.cpp | ||
x11_decoration_renderer.h | ||
x11_output.cpp | ||
x11_output.h | ||
x11_platform.cpp | ||
x11_platform.h | ||
x11cursor.cpp | ||
x11cursor.h | ||
xfixes_cursor_event_filter.cpp | ||
xfixes_cursor_event_filter.h | ||
xinputintegration.cpp | ||
xinputintegration.h |