l10n daemon script 94d009ec02 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 12:01:48 +00:00
..
CMakeLists.txt	Move X11Cursor into the x11standalone platform plugin	2016-08-19 10:57:09 +02:00
edge.cpp	Create screen edge through the Platform	2016-04-19 13:29:55 +02:00
edge.h	Create screen edge through the Platform	2016-04-19 13:29:55 +02:00
glxbackend.cpp	Remove the unredirect fullscreen windows functionality	2016-08-04 14:48:35 +02:00
glxbackend.h	Move glxbackend to x11 standalone plugin	2016-04-15 07:46:02 +02:00
logging.cpp	[plugins/platforms] Dedicated logging category for X11 standalone platform	2016-04-12 14:48:54 +02:00
logging.h	[plugins/platforms] Dedicated logging category for X11 standalone platform	2016-04-12 14:48:54 +02:00
screens_xrandr.cpp	Move XRandrScreens to the x11/standalone plugin	2016-04-12 08:04:16 +02:00
screens_xrandr.h	Move XRandrScreens to the x11/standalone plugin	2016-04-12 08:04:16 +02:00
x11.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-10-21 12:01:48 +00:00
x11_platform.cpp	Move X11Cursor into the x11standalone platform plugin	2016-08-19 10:57:09 +02:00
x11_platform.h	Move X11Cursor into the x11standalone platform plugin	2016-08-19 10:57:09 +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