Acaki 47a590e92a Merge branch 'Integration' into feat/frame_pacing_metal ...

# Conflicts:
#	VoidLink.xcodeproj/project.pbxproj
#	VoidLink/Base.lproj/iPad.storyboard
#	VoidLink/Database/DataManager.m
#	VoidLink/Database/TemporarySettings.m
#	VoidLink/SceneDelegate.h
#	VoidLink/Stream/StreamManager.m
#	VoidLink/Stream/VideoDecoderRenderer.h
#	VoidLink/Stream/VideoDecoderRenderer.m
#	VoidLink/ViewControllers/MainFrameViewController.m
#	VoidLink/ViewControllers/SettingsViewController.m

2025-07-12 20:12:20 +08:00

..

project.xcworkspace

Merge branch 'PiP2' into PiP1

2025-07-12 16:04:16 +08:00

project.pbxproj

Merge branch 'Integration' into feat/frame_pacing_metal

2025-07-12 20:12:20 +08:00