l10n daemon script c54ec46b65 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-02-03 09:28:15 +00:00
..
drm	Use kwinApp()->config() instead of KSharedConfig::openConfig()	2016-01-29 11:24:18 +01:00
fbdev	SVN_SILENT made messages (.desktop file)	2016-01-10 14:47:34 +00:00
hwcomposer	SVN_SILENT made messages (.desktop file)	2016-01-10 14:47:34 +00:00
virtual	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-01-12 12:09:37 +00:00
wayland	SVN_SILENT made messages (.desktop file)	2016-01-10 14:47:34 +00:00
x11	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-02-03 09:28:15 +00:00
CMakeLists.txt	Only compile VirtualTerminal if libinput is found	2015-12-01 07:57:39 +01:00