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

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

author	l10n daemon script <scripty@kde.org>
	Tue, 5 May 2015 14:00:14 +0000 (14:00 +0000)
committer	l10n daemon script <scripty@kde.org>
	Tue, 5 May 2015 14:00:14 +0000 (14:00 +0000)
commit	c1a2c0f1a76dd1df7109d11a9f511b8c33d85054
tree	276378cbbfa4b733c3003bdede1059bd76a92721	tree
parent	f1c5cd302ad382613edc0a1cb2c88bcb2a670b95	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