6 commits

Author	SHA1	Message	Date
l10n daemon script	873a51cc62	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-04-20 04:17:52 +02:00
l10n daemon script	4a5734c3c4	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-04-17 04:05:09 +02:00
l10n daemon script	d966302de7	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-04-11 09:44:49 +02:00
l10n daemon script	3e6f042dc2	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-04-10 04:01:17 +02:00
l10n daemon script	c6b32908bf	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-04-09 04:07:54 +02:00
Martin Gräßlin	1648844005	[kcmkwin] Add a new config module for touch screen gestures ... Summary: This is basically a copy of the screen edges config module with everything removed which does not matter. This is lazy and could be done with more code sharing. But it would be better to redesign both kcms in a modern way instead of investing lots of time on sharing code. Test Plan: Installed, opened it and verified it had the config selected I had manually set. Reviewers: #kwin, #plasma Subscribers: plasma-devel, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D5282	2017-04-07 16:18:46 +02:00