marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-27 14:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
shift-shell/applets
History
l10n daemon script c2f443e350 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-04-26 03:59:24 +02:00
..
activities SVN_SILENT made messages (.desktop file) - always resolve ours 2017-01-09 06:03:34 +01:00
clock SVN_SILENT made messages (.desktop file) - always resolve ours 2017-04-26 03:59:24 +02:00
notifications SVN_SILENT made messages (.desktop file) - always resolve ours 2017-01-09 06:03:34 +01:00
CMakeLists.txt add a very simple activity switcher 2016-09-05 16:05:48 +02:00