diff options
| author | Emmanuel Pescosta <[email protected]> | 2014-05-25 14:43:18 +0200 |
|---|---|---|
| committer | Emmanuel Pescosta <[email protected]> | 2014-05-25 14:43:18 +0200 |
| commit | fa36c3fd1f53a223f43bb57d7c28e431a889a7c2 (patch) | |
| tree | ddf2c2747d952babbdbcebb12c5d661953aef744 /src/dolphindockwidget.cpp | |
| parent | a46121dc510f987f2d164b43eaf5f84ea8c83cb8 (diff) | |
| parent | 4fe788f1157426e819f1ba31d1ee6388759cfd18 (diff) | |
Merge branch 'master' into frameworks
Conflicts:
dolphin/src/statusbar/statusbarspaceinfo.cpp
Diffstat (limited to 'src/dolphindockwidget.cpp')
0 files changed, 0 insertions, 0 deletions