l10n daemon script c10fe06d06 SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"		2020-06-18 05:44:57 +02:00
..
CMakeLists.txt	[x11] Enable synchronized resizing for Xwayland clients	2020-04-29 16:37:23 +03:00
edge.cpp	Make it possible to have a separate cursor for the tablet	2020-04-03 01:16:45 +02:00
edge.h
effects_mouse_interception_x11_filter.cpp
effects_mouse_interception_x11_filter.h
effects_x11.cpp	Make it possible to have a separate cursor for the tablet	2020-04-03 01:16:45 +02:00
effects_x11.h
glx_context_attribute_builder.cpp
glx_context_attribute_builder.h
glxbackend.cpp	Revert "Fix build with Qt 5.12, Qt::hex and Qt::endl"	2020-04-24 10:18:45 +03:00
glxbackend.h	Revert "[platforms/x11] Remove triple buffering detection"	2020-01-16 10:00:20 +01:00
logging.cpp
logging.h
non_composited_outline.cpp
non_composited_outline.h
overlaywindow_x11.cpp
overlaywindow_x11.h
screenedges_filter.cpp	ScreenEdge: Do not use localtime for measuring duration	2020-02-03 12:26:17 +01:00
screenedges_filter.h
screens_xrandr.cpp
screens_xrandr.h
windowselector.cpp	Make it possible to have a separate cursor for the tablet	2020-04-03 01:16:45 +02:00
windowselector.h
x11.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:44:57 +02:00
x11_decoration_renderer.cpp
x11_decoration_renderer.h
x11_output.cpp	[x11] Provide physical dimensions for outputs	2020-06-17 10:53:12 +03:00
x11_output.h	[x11] Provide physical dimensions for outputs	2020-06-17 10:53:12 +03:00
x11_platform.cpp	[x11] Provide physical dimensions for outputs	2020-06-17 10:53:12 +03:00
x11_platform.h	[x11] Enable synchronized resizing for Xwayland clients	2020-04-29 16:37:23 +03:00
x11cursor.cpp	x11: register the cursor as well	2020-04-03 20:01:09 +02:00
x11cursor.h
xfixes_cursor_event_filter.cpp
xfixes_cursor_event_filter.h
xinputintegration.cpp
xinputintegration.h