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

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

author	l10n daemon script <scripty@kde.org>
	Sat, 4 Apr 2015 11:02:00 +0000 (11:02 +0000)
committer	l10n daemon script <scripty@kde.org>
	Sat, 4 Apr 2015 11:02:00 +0000 (11:02 +0000)
commit	4e96b1a42f7718d7c2401e5abed3e30267f7e0ea
tree	bd7347e3f0f25b217f16765c83f708f4bab549ea	tree
parent	de84f223d4408dc1eaf6f15ebeed2e8acf49ad4c	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