shift-shell/applets/quicksettings
l10n daemon script 3c628b921e 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"
2019-05-20 05:39:37 +02:00
..
package SVN_SILENT made messages (.desktop file) - always resolve ours 2019-05-20 05:39:37 +02:00
CMakeLists.txt Revert "remove quicksettings applet" 2017-08-30 18:52:43 +02:00
Messages.sh Revert "remove quicksettings applet" 2017-08-30 18:52:43 +02:00
quicksettings.cpp Revert "remove quicksettings applet" 2017-08-30 18:52:43 +02:00
quicksettings.h Revert "remove quicksettings applet" 2017-08-30 18:52:43 +02:00