History

Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco

r3tk0n committed 7 years ago

Commit 39342b92 parents ce2e0c7 c0240d2321 files · +10278 −2523Browse files

Showing the changes to interface/src/ui/PreferencesDialog.cpp (1 of 321 files). Show all

Unified · Split

interface/src/ui/PreferencesDialog.cpp+1−0
@@ -15,6 +15,7 @@ · 14 unmodified lines
15#include <OffscreenUi.h>15#include <OffscreenUi.h>
16#include <Preferences.h>16#include <Preferences.h>
17#include <RenderShadowTask.h>17#include <RenderShadowTask.h>
18#include <plugins/PluginUtils.h>
18#include <display-plugins/CompositorHelper.h>19#include <display-plugins/CompositorHelper.h>
19 20
20#include "Application.h"21#include "Application.h"

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t