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 da8d16deca 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"
5 years ago
..
AUTHORS
CMakeLists.txt
ChangeLog
Messages.sh
actions.ui
advanced.ui
focus.ui
kwinactions.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 5 years ago
kwinadvanced.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 5 years ago
kwinfocus.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 5 years ago
kwinmoving.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 5 years ago
kwinoptions.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 5 years ago
main.cpp
main.h
mouse.cpp
mouse.h
mouse.ui
moving.ui
windows.cpp
windows.h