]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7e30467 2d8872c)
Merge remote-tracking branch 'origin/KDE/4.11'
authorFrank Reininghaus <frank78ac@googlemail.com>
Mon, 9 Sep 2013 19:21:43 +0000 (21:21 +0200)
committerFrank Reininghaus <frank78ac@googlemail.com>
Mon, 9 Sep 2013 19:27:22 +0000 (21:27 +0200)
commit258f0f60feb76876c846294c23121d41997ddc34
tree7f5ad16a1e10a4418bf6dc936cadd85849b98ff7tree
parent7e30467679a403f953e2547894febb51e8a3d78bcommit | diff
parent2d8872c3accbf4a6f07e3ce4d220c9f87057545acommit | diff
Merge remote-tracking branch 'origin/KDE/4.11'

The most recent commit from the KDE/4.11 branch (new unit test) had to
be modified slightly due to the changed signal emission when resorting
the model changes only the groups, and not the order of the items
(groupsChaged instead of itemsMoved).
src/dolphinviewcontainer.cpp diff1 | diff2 | blob | history
src/tests/kfileitemmodeltest.cpp diff1 | diff2 | blob | history