]> cloud.milkyroute.net Git - dolphin.git/commit
Merge remote-tracking branch 'origin/KDE/4.10'
authorFrank Reininghaus <frank78ac@googlemail.com>
Tue, 19 Feb 2013 14:45:44 +0000 (15:45 +0100)
committerFrank Reininghaus <frank78ac@googlemail.com>
Tue, 19 Feb 2013 14:45:44 +0000 (15:45 +0100)
commitcc1455c0e6076c4abd5e321343be456184c51f5e
treed9421bcd8ae237cd1eb97f30d1e645d10de9eb90
parente6ef1eec3a5c0b9fdabff144990d06250fc1839e
parent518b53feb43325d5c194fa15118e80ab0729b620
Merge remote-tracking branch 'origin/KDE/4.10'

Conflicts:
dolphin/src/tests/kfileitemmodeltest.cpp
lib/konq/konq_operations.cpp
src/kitemviews/kfileitemmodel.cpp
src/panels/places/placespanel.cpp
src/tests/kfileitemmodeltest.cpp