]> cloud.milkyroute.net Git - dolphin.git/commit
Merge remote-tracking branch 'origin/master' into frameworks
authorFrank Reininghaus <frank78ac@googlemail.com>
Fri, 24 Oct 2014 16:49:05 +0000 (18:49 +0200)
committerFrank Reininghaus <frank78ac@googlemail.com>
Fri, 24 Oct 2014 16:49:05 +0000 (18:49 +0200)
commitfa988586bc923b33497cbc97aaac07fc93a4ca83
tree1232efe3052753b7f406f11fc1d84476b2282d96
parentc07a97c4be1b5118026ea95831fd1edf7fac34e9
parent1f02d15f7ec13dd206698f88a92a9949cbfc3470
Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
dolphin/src/panels/terminal/terminalpanel.cpp
dolphin/src/panels/terminal/terminalpanel.h
src/panels/information/phononwidget.cpp
src/panels/terminal/terminalpanel.cpp
src/panels/terminal/terminalpanel.h