l10n daemon script e68356831b 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"		2018-04-22 05:43:11 +02:00
..
CMakeLists.txt	Merge branch 'Plasma/5.11'	2017-11-05 10:46:53 +01:00
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	Merge branch 'Plasma/5.11'	2017-11-20 18:13:35 +01:00
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
sync_filter.cpp
sync_filter.h
windowselector.cpp	[x11] Fix interactive point selection	2018-02-05 21:21:27 +01:00
windowselector.h	[x11] Fix interactive point selection	2018-02-05 21:21:27 +01:00
x11.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-04-22 05:43:11 +02:00
x11_decoration_renderer.cpp
x11_decoration_renderer.h
x11_platform.cpp	[x11] Fix interactive point selection	2018-02-05 21:21:27 +01:00
x11_platform.h	[x11] Fix interactive point selection	2018-02-05 21:21:27 +01:00
x11cursor.cpp
x11cursor.h
xfixes_cursor_event_filter.cpp
xfixes_cursor_event_filter.h
xinputintegration.cpp
xinputintegration.h