5a021dc500
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" |
||
---|---|---|
.. | ||
qml | ||
test | ||
CMakeLists.txt | ||
compositing.cpp | ||
compositing.h | ||
compositing.ui | ||
config-compiler.h.cmake | ||
config-prefix.h.cmake | ||
effectconfig.cpp | ||
effectconfig.h | ||
kcmkwineffects.desktop | ||
kwincompositing.desktop | ||
kwineffect.knsrc | ||
main.cpp | ||
Messages.sh | ||
model.cpp | ||
model.h |