mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-05 16:19:10 +00:00
4cf04b91dd
Since the master branch had never been merged into frameworks since the creation of the frameworks branch, I had to fix a couple of merge conflicts and make another change in order to make it build - I hope I did not get anything wrong. We should probably merge master into frameworks on a regular basis from now on. CCMAIL:kfm-devel@kde.org Conflicts: dolphin/src/dolphinmainwindow.cpp dolphin/src/search/dolphinfacetswidget.cpp dolphin/src/statusbar/dolphinstatusbar.cpp dolphin/src/views/dolphinview.cpp |
||
---|---|---|
src | ||
AUTHORS | ||
CMakeLists.txt | ||
COPYING | ||
COPYING.DOC | ||
README |
See http://dolphin.kde.org for information about Dolphin.