plasma-framework/autotests/data
l10n daemon script 694131fdb6 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-11-14 12:52:39 +00:00
..
signedPackage SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-04 17:07:45 +00:00
testfallbackpackage SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-14 12:52:39 +00:00
testpackage SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-04 17:07:45 +00:00
background.svgz add an autotest for some properties of FrameSvg 2014-07-21 19:38:11 +02:00