marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
shift-shell/applets
History
l10n daemon script 69f223746d 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"
2020-12-25 06:23:37 +01:00
..
activities SVN_SILENT made messages (.desktop file) - always resolve ours 2020-12-20 06:16:31 +01:00
clock SVN_SILENT made messages (.desktop file) - always resolve ours 2020-12-20 06:16:31 +01:00
krunner SVN_SILENT made messages (.desktop file) - always resolve ours 2020-12-25 06:23:37 +01:00
CMakeLists.txt disable own clock for now 2020-07-23 15:27:24 +02:00