mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-12 12:54:29 +00:00
![]() Conflicts: plasma/applets/folderview/folderview.cpp CCMAIL: ignat.semenov@blue-systems.com @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! |
||
---|---|---|
src | ||
AUTHORS | ||
CMakeLists.txt | ||
COPYING | ||
COPYING.DOC | ||
README |
See http://dolphin.kde.org for information about Dolphin.