l10n daemon script 501128ccf4 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"		2016-10-21 09:32:33 +00:00
..
CMakeLists.txt	Move X11Cursor into the x11standalone platform plugin	2016-08-19 10:57:09 +02:00
edge.cpp
edge.h
glxbackend.cpp
glxbackend.h
logging.cpp
logging.h
screens_xrandr.cpp
screens_xrandr.h
x11.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-10-21 09:32:33 +00:00
x11_platform.cpp	Add a PlatformCursorImage to Platform and EffectsHandler	2016-10-20 07:51:49 +02:00
x11_platform.h	Add a PlatformCursorImage to Platform and EffectsHandler	2016-10-20 07:51:49 +02:00
x11cursor.cpp	Move X11Cursor into the x11standalone platform plugin	2016-08-19 10:57:09 +02:00
x11cursor.h	Move X11Cursor into the x11standalone platform plugin	2016-08-19 10:57:09 +02:00
xinputintegration.cpp	Add event filter for key press/release events while KWin grabbed keyboard on root window	2016-10-10 16:59:06 +02:00
xinputintegration.h	Add event filter for key press/release events while KWin grabbed keyboard on root window	2016-10-10 16:59:06 +02:00