github-forks
/
latte-dock
mirror of https://github.com/KDE/latte-dock.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
latte-dock/indicators
History
l10n daemon script 2560828067 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"
..
default SVN_SILENT made messages (.desktop file) - always resolve ours
org.kde.latte.plasma SVN_SILENT made messages (.desktop file) - always resolve ours
org.kde.latte.plasmatabstyle SVN_SILENT made messages (.desktop file) - always resolve ours
CMakeLists.txt introduce new PlasmaTabStyle indicator
Messages.sh introduce new PlasmaTabStyle indicator