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 ba0b34c755 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"
6 years ago
..
qml [KCMs] move GHNS buttons to the normal location 6 years ago
test
CMakeLists.txt [effects] Make scripted effects GHNS-able 6 years ago
Messages.sh
compositing.cpp
compositing.h
compositing.ui
config-compiler.h.cmake
config-prefix.h.cmake
effectconfig.cpp
effectconfig.h
kcmkwineffects.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 6 years ago
kwincompositing.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 6 years ago
kwineffect.knsrc
main.cpp Fix compile when we use QT_NO_NARROWING_CONVERSIONS_IN_CONNECT flags 6 years ago
model.cpp [effects] Move Fade, Glide, and Scale effect into exclusive group 6 years ago
model.h