]> cloud.milkyroute.net Git - dolphin.git/commitdiff
projects / dolphin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c73bf69 96672c1)
Merge branch 'KDE/4.9'
authorLuca Beltrame <lbeltrame@kde.org>
Tue, 20 Nov 2012 06:44:59 +0000 (07:44 +0100)
committerLuca Beltrame <lbeltrame@kde.org>
Tue, 20 Nov 2012 06:44:59 +0000 (07:44 +0100)
Conflicts:
konqueror/settings/kio/kcookiespolicies.cpp [master only changes]
konqueror/settings/kio/kcookiespolicies.h [ditto]

1  2 
src/views/dolphinview.cpp patch | diff1 | diff2 | blob | history

diff --cc src/views/dolphinview.cpp
Simple merge