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

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

author	l10n daemon script <scripty@kde.org>
	Sun, 29 May 2016 12:20:08 +0000 (12:20 +0000)
committer	l10n daemon script <scripty@kde.org>
	Sun, 29 May 2016 12:20:08 +0000 (12:20 +0000)
commit	fe6a7ac9f8b5ce6180fe265ac95b524ecc7805f6
tree	5eeee98ea7fb438017c7d93dd98d5065a33a1ba5	tree
parent	bed16191b5e9253d8658c0dac0d336b3dab5e0e3	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