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/containments/panel
History
l10n daemon script c98ed27c73 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"
2018-10-10 06:50:31 +02:00
..
package SVN_SILENT made messages (.desktop file) - always resolve ours 2018-10-10 06:50:31 +02:00
CMakeLists.txt merge quicksettings and the panel 2017-09-14 21:03:56 +02:00
phonepanel.cpp merge quicksettings and the panel 2017-09-14 21:03:56 +02:00
phonepanel.h merge quicksettings and the panel 2017-09-14 21:03:56 +02:00