]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit59e8f22cd5de7cc1811550d8bac6aacc5c36587c
treea553d6722ccffc119d7d7e43a49d0a5f1297c4ectree
parentc73bf691c6f93e4df5401cceeb536e831442c3c0commit | diff
parent96672c166f2acfe56b5a2779562082a0e9fab825commit | diff
Merge branch 'KDE/4.9'

Conflicts:
konqueror/settings/kio/kcookiespolicies.cpp [master only changes]
konqueror/settings/kio/kcookiespolicies.h [ditto]
src/views/dolphinview.cpp diff1 | diff2 | blob | history