You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
l10n daemon script 129636de2e 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"
9 years ago
..
qml
test
.reviewboardrc
CMakeLists.txt
Messages.sh
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
model.cpp
model.h