cloud.milkyroute.net Git - dolphin.git/commit

]> cloud.milkyroute.net Git - dolphin.git/commit

author	l10n daemon script <scripty@kde.org>
	Sun, 26 Jul 2015 19:57:51 +0000 (19:57 +0000)
committer	l10n daemon script <scripty@kde.org>
	Sun, 26 Jul 2015 19:57:51 +0000 (19:57 +0000)
commit	d1871eb1b84fa9697b69d98eac02ca0a58874a65
tree	bd0f9db85ba7324a106c925c1666b76b5cbbb355	tree
parent	8d2a8a0f920cfe1c7f2d24053ded0743d3047fb5	commit \| diff

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"

RSS Atom

src/dolphinpart.desktop		diff \| blob \| blame \| history
src/org.kde.dolphin.desktop		diff \| blob \| blame \| history
src/settings/kcm/kcmdolphingeneral.desktop		diff \| blob \| blame \| history
src/settings/kcm/kcmdolphinnavigation.desktop		diff \| blob \| blame \| history
src/settings/kcm/kcmdolphinservices.desktop		diff \| blob \| blame \| history
src/settings/kcm/kcmdolphinviewmodes.desktop		diff \| blob \| blame \| history
src/views/versioncontrol/fileviewversioncontrolplugin.desktop		diff \| blob \| blame \| history