latte-dock/app
l10n daemon script 7a17b5a107 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"
..
data pref option to disable geometries broadcasting
dbus get ready for Plasma LookNFeel packages
declarativeimports Use spdx syntax for all files
indicator Use spdx syntax for all files
layout cmdline:add dock/panel through --add-dock
layouts view:copy properly screen edge margin
package Use spdx syntax for all files
packageplugins SVN_SILENT made messages (.desktop file) - always resolve ours
plasma scrgeometries:public empty QRegion() correctly
settings ignore layout/view extensions properly
shortcuts Use spdx syntax for all files
templates ignore layout/view extensions properly
tools detailsdialog:provide color schemes model
view accept background radius 0%
wm window belongs in a screen whenever touching it
CMakeLists.txt actionsdialog:provide list widget item
FakeTarget.cmake revert previous commit, add KDECompilerSettings back
alternativeshelper.cpp Use spdx syntax for all files
alternativeshelper.h Use spdx syntax for all files
apptypes.cpp Use spdx syntax for all files
apptypes.h Use spdx syntax for all files
config-latte.h.cmake Revert "find Qt5 minor version"
infoview.cpp Use spdx syntax for all files
infoview.h Use spdx syntax for all files
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 fix vertical docks/panels positioning
lattecorona.h cmd:support "add-dock" through command line
lattedock.notifyrc SVN_SILENT made messages (.desktop file) - always resolve ours
main.cpp fix plasma available geometry broadcasting
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 multiscreen:disable struts under x11 when overlap
screenpool.h multiscreen:disable struts under x11 when overlap