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

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

author	l10n daemon script <scripty@kde.org>
	Mon, 30 Nov 2015 10:26:25 +0000 (10:26 +0000)
committer	l10n daemon script <scripty@kde.org>
	Mon, 30 Nov 2015 10:26:25 +0000 (10:26 +0000)
commit	d3c9d3c31f4caa685e4ea7f909f88cb3dc21aafb
tree	deed68addb9d84edd3450a6d34102b222db13b1c	tree
parent	090f3e90ea4ce43c6d5e90c7b82c13a52222c72c	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