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
@@ -120,6 +120,7 @@
|
||||
self.enableGraphs = settings.enableGraphs;
|
||||
self.graphOpacity = settings.graphOpacity;
|
||||
self.renderingBackend = settings.renderingBackend;
|
||||
self.backgroundSessionTimer = settings.backroundSessionTimer;
|
||||
#endif
|
||||
self.uniqueId = settings.uniqueId;
|
||||
|
||||
|
||||
Reference in new issue
Block a user