dolphin/src/views/versioncontrol
l10n daemon script e3ea9b558e 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"
2017-02-05 05:58:09 +01:00
..
fileviewversioncontrolplugin.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2017-02-05 05:58:09 +01:00
kversioncontrolplugin.cpp Move the KVersionControlPlugin2 interface from konqlib to Dolphin and remove the deprecated KVersionControlPlugin interface from konqlib 2015-02-25 17:21:10 +01:00
kversioncontrolplugin.h Don't use old (not existing) names in the documentation. 2016-05-16 19:06:32 +02:00
updateitemstatesthread.cpp Move the KVersionControlPlugin2 interface from konqlib to Dolphin and remove the deprecated KVersionControlPlugin interface from konqlib 2015-02-25 17:21:10 +01:00
updateitemstatesthread.h Move the KVersionControlPlugin2 interface from konqlib to Dolphin and remove the deprecated KVersionControlPlugin interface from konqlib 2015-02-25 17:21:10 +01:00
versioncontrolobserver.cpp [CLAZY] Fixed all level 1 and level 2 warnings with small exceptions 2016-03-16 22:17:37 +01:00
versioncontrolobserver.h Move the KVersionControlPlugin2 interface from konqlib to Dolphin and remove the deprecated KVersionControlPlugin interface from konqlib 2015-02-25 17:21:10 +01:00