kwin/plugins/platforms/x11/standalone
l10n daemon script 9a10eabc11 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-04-13 09:34:52 +00:00
..
CMakeLists.txt [plugins/platforms] Dedicated logging category for X11 standalone platform 2016-04-12 14:48:54 +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-04-13 09:34:52 +00:00
x11_platform.cpp Move XRandrScreens to the x11/standalone plugin 2016-04-12 08:04:16 +02:00
x11_platform.h Move XRandrScreens to the x11/standalone plugin 2016-04-12 08:04:16 +02:00