diff options
| author | Frank Reininghaus <[email protected]> | 2013-04-23 19:40:42 +0200 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2013-04-23 19:40:42 +0200 |
| commit | 7f381a34cb37ff4aeb215a8fe91448e5ea27aca0 (patch) | |
| tree | 30dc3aba09fa11aa8de805651aeae39a809ac128 /src/dolphindockwidget.cpp | |
| parent | 9b30145ac31d2bf4d108c836616b5090ed783899 (diff) | |
| parent | 8f4d13dab8165e4c60c320d4b867e8476bdb041b (diff) | |
Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
plasma/applets/folderview/folderview.cpp
CCMAIL: [email protected]
@Ignat: We've been following a merge-based approach in kde-baseapps
for quite some time now, see
http://lists.kde.org/?t=134744909400005&r=1&w=1
It would be nice if you could merge KDE/4.10 into master after any
non-trivial changes in folderview to prevent that others have to
figure out how to resolve the merge conflicts. Thanks!
Diffstat (limited to 'src/dolphindockwidget.cpp')
0 files changed, 0 insertions, 0 deletions