]> cloud.milkyroute.net Git - dolphin.git/commit
Merge remote-tracking branch 'origin/KDE/4.10'
authorFrank Reininghaus <frank78ac@googlemail.com>
Sun, 10 Mar 2013 17:31:23 +0000 (18:31 +0100)
committerFrank Reininghaus <frank78ac@googlemail.com>
Sun, 10 Mar 2013 17:31:23 +0000 (18:31 +0100)
commitf71e0881d2c0a52c5fa020e3fd2b44ca6ab7b2d4
treee711afe6b0e40c3efec8ff920af009c7c4e2155c
parentbe8443bed87c1f27a9cd1f82d969cc06f91c2f62
parent9dd728cb98e0ea822248c641aef5d66f2476768e
Merge remote-tracking branch 'origin/KDE/4.10'

Conflicts:
dolphin/src/kitemviews/kfileitemmodel.cpp
src/kitemviews/kfileitemmodel.cpp
src/tests/kfileitemmodeltest.cpp