kwin/scripts
l10n daemon script 2befb1f81c 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-09-05 09:38:26 +00: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-06-23 23:41:42 +00:00
minimizeall
synchronizeskipswitcher
videowall SVN_SILENT made messages (.desktop file) - always resolve ours 2016-09-05 09:38:26 +00:00
CMakeLists.txt
Messages.sh