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

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

author	l10n daemon script <scripty@kde.org>
	Sun, 15 Mar 2015 09:54:53 +0000 (09:54 +0000)
committer	l10n daemon script <scripty@kde.org>
	Sun, 15 Mar 2015 09:54:53 +0000 (09:54 +0000)
commit	a7484d2ce51a6734a59a7b3f3ad9ef43c54717ee
tree	62bdee7282cac2994ff94f208593cf24b44d9d01	tree
parent	068c6e73209dd6e3f14e9ab8ef573a5dbdb71a2d	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