Merge branch 'hotfix/logochange' into develop
# Conflicts: # Resources/skin/deaufult.rcc # takeout/takeout.rc # takeout/view/floatForm.cpp 1.调整悬浮窗
Showing


# Conflicts: # Resources/skin/deaufult.rcc # takeout/takeout.rc # takeout/view/floatForm.cpp 1.调整悬浮窗
9.02 KB | W: | H:
2.45 KB | W: | H:
10.2 KB | W: | H:
2.78 KB | W: | H: