Merge remote-tracking branch 'upstream/Integration' into feat/frame_pacing_metal
# Conflicts: # VoidLink/Base.lproj/iPad.storyboard # VoidLink/Database/DataManager.h # VoidLink/Database/DataManager.m # VoidLink/Database/TemporarySettings.m # VoidLink/ViewControllers/MainFrameViewController.m # VoidLink/ViewControllers/SettingsViewController.h # VoidLink/ViewControllers/SettingsViewController.m # VoidLink/ViewControllers/StreamFrameViewController.m
This commit is contained in:
commit
46526603cc
14 files changed
+260
-76
No files matched your search
@@ -39,6 +39,7 @@
|
||||
@property (nonatomic, retain) NSNumber * resolutionSelected;
|
||||
@property (nonatomic, retain) NSNumber * externalDisplayMode;
|
||||
@property (nonatomic, retain) NSNumber * localMousePointerMode;
|
||||
@property (nonatomic, retain) NSNumber * backgroundSessionTimer;
|
||||
@property (nonatomic) enum {
|
||||
CODEC_PREF_AUTO,
|
||||
CODEC_PREF_H264,
|
||||
|
||||
Reference in new issue
Block a user