范朋程 3fa69b4201 Merge branch 'maintain/5.0' into uos
# Conflicts:
#	frame/util/docksettings.cpp
#	frame/util/docksettings.h
#	frame/window/mainwindow.cpp
#	frame/window/mainwindow.h
#	plugins/power/power.qrc
2020-07-06 14:16:29 +08:00
..
2019-10-23 09:25:39 +08:00
2019-10-23 09:25:39 +08:00
2019-10-23 09:25:39 +08:00
2018-12-18 11:28:36 +08:00
2020-06-16 13:54:23 +08:00