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:
@@ -119,6 +119,9 @@
|
||||
@property (strong, nonatomic) IBOutlet UIStepper *graphOpacityStepper;
|
||||
@property (strong, nonatomic) IBOutlet UISegmentedControl *renderingBackendSelector;
|
||||
|
||||
@property (strong, nonatomic) IBOutlet UIStackView *backgroundSessionTimerStack;
|
||||
@property (strong, nonatomic) IBOutlet UISlider *backgroundSessionTimerSlider;
|
||||
|
||||
|
||||
|
||||
#pragma clang diagnostic push
|
||||
|
||||
Reference in New Issue
Block a user