]> cloud.milkyroute.net Git - dolphin.git/commit
Merge remote-tracking branch 'origin/master' into frameworks
authorFrank Reininghaus <frank78ac@googlemail.com>
Sun, 1 Jun 2014 12:52:56 +0000 (14:52 +0200)
committerFrank Reininghaus <frank78ac@googlemail.com>
Sun, 1 Jun 2014 12:52:56 +0000 (14:52 +0200)
commit59d01e8accbfb7f31fb5ea5ef4c94e57d427994a
tree62fca4d77b0644581c12b4bb81e6fc63091222cf
parentfa36c3fd1f53a223f43bb57d7c28e431a889a7c2
parent90e27974a4a4a3cb4d08717b5270bea8645b063e
Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
lib/konq/konq_operations.cpp
src/kitemviews/kitemlistview.cpp
src/kitemviews/kitemlistwidget.cpp