kwin/scripts
l10n daemon script 8725f2441e 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-03-22 05:17:38 +01:00
..
desktopchangeosd Adding more frameless hints 2016-08-11 08:45:41 +02:00
enforcedeco SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-13 04:11:59 +01:00
minimizeall SVN_SILENT made messages (.desktop file) - always resolve ours 2017-03-22 05:17:38 +01:00
synchronizeskipswitcher SVN_SILENT made messages (.desktop file) - always resolve ours 2016-05-31 11:06:54 +00:00
videowall SVN_SILENT made messages (.desktop file) - always resolve ours 2016-09-05 09:38:26 +00:00
CMakeLists.txt
Messages.sh