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" |
6 years ago | |
---|---|---|
.. | ||
dbus | ||
indicator | ||
layout | ||
package | ||
packageplugins | ||
plasma | 6 years ago | |
settings | 6 years ago | |
shortcuts | ||
view | 6 years ago | |
wm | ||
CMakeLists.txt | ||
FakeTarget.cmake | ||
alternativeshelper.cpp | ||
alternativeshelper.h | ||
config-latte.h.cmake | 6 years ago | |
importer.cpp | ||
importer.h | ||
infoview.cpp | 6 years ago | |
infoview.h | ||
latte-indicators.knsrc | ||
latte-layouts.knsrc | ||
lattecorona.cpp | 6 years ago | |
lattecorona.h | 6 years ago | |
lattedock.notifyrc | 6 years ago | |
launcherssignals.cpp | ||
launcherssignals.h | ||
layoutmanager.cpp | ||
layoutmanager.h | ||
main.cpp | ||
org.kde.latte-dock.appdata.xml.cmake | ||
org.kde.latte-dock.desktop.cmake | ||
schemecolors.cpp | ||
schemecolors.h | ||
screenpool.cpp | ||
screenpool.h |