latte-dock/app
l10n daemon script a3e747188f 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"
..
dbus support wallpaper slideshows
indicator update indicators runtime
layout track kwinrc file only on changes
layouts Fix minor EBN issues
package simplify CMakeLists
packageplugins SVN_SILENT made messages (.desktop file) - always resolve ours
plasma Fix minor EBN issues
settings search for Latte desktop file in more generic way
shortcuts track kwinrc file only on changes
view remove obsolete fontmetrics libraries
wm ignore Plasma panels in Latte heuristics
CMakeLists.txt drop ksysguard dependency for kf5>=5.62
FakeTarget.cmake FakeTarget moved to app/
alternativeshelper.cpp add headers comments for all c++ files
alternativeshelper.h add headers comments for all c++ files
config-latte.h.cmake support kdeclarative both <5.45 and >=5.45
infoview.cpp support kdeclarative both <5.45 and >=5.45
infoview.h refactor:rename DockCorona to Latte::Corona
latte-indicators.knsrc SVN_SILENT made messages (.desktop file) - always resolve ours
latte-layouts.knsrc SVN_SILENT made messages (.desktop file) - always resolve ours
lattecorona.cpp Import and Load layout runtime through dbus
lattecorona.h REFACTOR:add WindowSystem namespace
lattedock.notifyrc SVN_SILENT made messages (.desktop file) - always resolve ours
main.cpp Get rid of deprecated setHidden()
org.kde.latte-dock.appdata.xml.cmake GIT_SILENT made messages (after extraction)
org.kde.latte-dock.desktop.cmake SVN_SILENT made messages (.desktop file) - always resolve ours
screenpool.cpp Views Report Information for inactive layouts
screenpool.h improve Screens Report