]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Merge branch 'master' into kf6
authorNicolas Fella <nicolas.fella@gmx.de>
Thu, 10 Aug 2023 12:42:08 +0000 (14:42 +0200)
committerNicolas Fella <nicolas.fella@gmx.de>
Thu, 10 Aug 2023 12:42:08 +0000 (14:42 +0200)
1  2 
CMakeLists.txt
src/dolphinmainwindow.cpp
src/views/dolphinview.cpp

diff --cc CMakeLists.txt
Simple merge
Simple merge
Simple merge