]> cloud.milkyroute.net Git - dolphin.git/commit
Merge remote-tracking branch 'origin/master' into frameworks
authorFrank Reininghaus <frank78ac@googlemail.com>
Wed, 21 May 2014 20:49:40 +0000 (22:49 +0200)
committerFrank Reininghaus <frank78ac@googlemail.com>
Wed, 21 May 2014 20:49:40 +0000 (22:49 +0200)
commita46121dc510f987f2d164b43eaf5f84ea8c83cb8
tree5dd88b57e12f29b1dba631bd2add37c98145d922
parent6edcabf9a098ba9cb5099443a9cd227453a3f72b
parentf27c1242371db1e69edab78f0bbca05206f47adf
Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
dolphin/src/search/filenamesearchprotocol.cpp
src/dolphinmainwindow.cpp
src/kitemviews/kfileitemmodel.cpp
src/panels/places/placesitem.cpp
src/search/filenamesearchprotocol.cpp
src/settings/additionalinfodialog.cpp