kwin/scripts
l10n daemon script 0015ff2ac6 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"
2019-02-17 08:30:42 +01:00
..
desktopchangeosd [desktopchangeosd] Sync desktop switch OSD font size to Plasma OSD font size 2018-10-28 16:46:50 +00:00
enforcedeco SVN_SILENT made messages (.desktop file) - always resolve ours 2018-11-22 06:02:11 +01:00
minimizeall SVN_SILENT made messages (.desktop file) - always resolve ours 2019-02-17 08:30:42 +01:00
synchronizeskipswitcher SVN_SILENT made messages (.desktop file) - always resolve ours 2018-12-24 05:25:01 +01:00
videowall SVN_SILENT made messages (.desktop file) - always resolve ours 2018-08-27 05:52:15 +02:00
CMakeLists.txt add "MinimizeAll" script 2015-04-07 23:59:17 +02:00
Messages.sh Extract messages from scripts and scripting module 2013-03-04 10:29:25 +01:00