shift-shell/containments/panel
l10n daemon script c8419144ad 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-06-18 05:45:52 +02:00
..
dbus Quicksettings: add toggle for enabling/disabling screen rotation 2020-04-29 21:42:48 +02:00
package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 05:45:52 +02:00
CMakeLists.txt Quicksettings: add toggle for enabling/disabling screen rotation 2020-04-29 21:42:48 +02:00
Messages.sh add Messages.sh in shell and containments 2019-11-20 12:35:14 +05:30
phonepanel.cpp Quicksettings: add toggle for enabling/disabling screen rotation 2020-04-29 21:42:48 +02:00
phonepanel.h Quicksettings: add toggle for enabling/disabling screen rotation 2020-04-29 21:42:48 +02:00