l10n daemon script df306a4062 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"		2017-02-28 12:58:59 +01:00
..
CMakeLists.txt	Move linking to DL_LIBRARY to x11standalone platform	2016-11-22 14:22:06 +01:00
edge.cpp
edge.h
glxbackend.cpp	Move linking to DL_LIBRARY to x11standalone platform	2016-11-22 14:22:06 +01:00
glxbackend.h	Remove KWin::display from kwinglobals	2016-11-16 18:00:00 +01:00
logging.cpp
logging.h
screens_xrandr.cpp
screens_xrandr.h
windowselector.cpp	Support interactive window selection through the Platform	2016-11-17 08:08:56 +01:00
windowselector.h	Support interactive window selection through the Platform	2016-11-17 08:08:56 +01:00
x11.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-02-28 12:58:59 +01:00
x11_platform.cpp	Split modifier only handling into a dedicated InputEventSpy	2017-02-14 17:02:18 +01:00
x11_platform.h	Move X11 specific KGlobalAccel handling into the x11-standalone platform	2017-01-17 17:01:32 +01: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	Split modifier only handling into a dedicated InputEventSpy	2017-02-14 17:02:18 +01:00
xinputintegration.h	Split modifier only handling into a dedicated InputEventSpy	2017-02-14 17:02:18 +01:00