kwin/scripts
l10n daemon script adf9cb767d 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"
2018-05-18 05:45:28 +02:00
..
desktopchangeosd Adding more frameless hints 2016-08-11 08:45:41 +02:00
enforcedeco SVN_SILENT made messages (.desktop file) - always resolve ours 2018-01-07 05:00:26 +01:00
minimizeall SVN_SILENT made messages (.desktop file) - always resolve ours 2018-03-30 05:25:18 +02:00
synchronizeskipswitcher SVN_SILENT made messages (.desktop file) - always resolve ours 2018-05-18 05:45:28 +02:00
videowall SVN_SILENT made messages (.desktop file) - always resolve ours 2018-01-29 05:06:41 +01: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