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

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

author	l10n daemon script <scripty@kde.org>
	Tue, 8 Sep 2015 12:47:01 +0000 (12:47 +0000)
committer	l10n daemon script <scripty@kde.org>
	Tue, 8 Sep 2015 12:47:01 +0000 (12:47 +0000)
commit	c9770e60839f60ffa29e56e9785a9a36b3d4a90c
tree	6e191d096a8388e677e7dc3556aa77daf7ac1964	tree
parent	2a18f450254e5d58152e747fbc150747cd34e218	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