kwin/effects/dialogparent/package
l10n daemon script 262da1b7c9 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"
2015-04-07 13:20:00 +00:00
..
contents/code bind desktopPresenceChanged in scripted effects 2014-01-14 22:24:09 +01:00
CMakeLists.txt
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07 13:20:00 +00:00