kwin/scripts
l10n daemon script f4e2e0e2e9 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"
2015-04-25 10:26:32 +00:00
..
desktopchangeosd SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-24 09:53:59 +00:00
enforcedeco SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-24 09:53:59 +00:00
minimizeall SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-25 10:26:32 +00:00
synchronizeskipswitcher SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-24 09:53:59 +00:00
videowall SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-24 09:53:59 +00:00
CMakeLists.txt add "MinimizeAll" script 2015-04-07 23:59:17 +02:00
Messages.sh