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

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

author	l10n daemon script <scripty@kde.org>
	Mon, 4 May 2015 10:09:13 +0000 (10:09 +0000)
committer	l10n daemon script <scripty@kde.org>
	Mon, 4 May 2015 10:09:13 +0000 (10:09 +0000)
commit	f1c5cd302ad382613edc0a1cb2c88bcb2a670b95
tree	ce9a944a91afa36aee45fbd19695eef720e7fb42	tree
parent	ece6650ecd3af0eb450e28a9aadcb0f4dd26cb24	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