diff options
| author | Frank Reininghaus <[email protected]> | 2014-10-24 18:49:05 +0200 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2014-10-24 18:49:05 +0200 |
| commit | fa988586bc923b33497cbc97aaac07fc93a4ca83 (patch) | |
| tree | 1232efe3052753b7f406f11fc1d84476b2282d96 /src/kitemviews/kitemlistwidget.cpp | |
| parent | c07a97c4be1b5118026ea95831fd1edf7fac34e9 (diff) | |
| parent | 1f02d15f7ec13dd206698f88a92a9949cbfc3470 (diff) | |
Merge remote-tracking branch 'origin/master' into frameworks
Conflicts:
dolphin/src/panels/terminal/terminalpanel.cpp
dolphin/src/panels/terminal/terminalpanel.h
Diffstat (limited to 'src/kitemviews/kitemlistwidget.cpp')
0 files changed, 0 insertions, 0 deletions