diff options
| author | Brad Davis <[email protected]> | 2013-08-16 12:01:23 -0700 |
|---|---|---|
| committer | Brad Davis <[email protected]> | 2013-08-16 12:01:23 -0700 |
| commit | e384cffd7245d1141f9ca81633ab62b07b8907f3 (patch) | |
| tree | c5e4debbbe6079ff14b7862cde49bf3b916ffb62 /LibOVR/Src/OVR_DeviceImpl.h | |
| parent | 20cfcf9dc9485002f05cf50d74ab45375cf0db59 (diff) | |
| parent | f29e505a7df820e1376d97b41515bdc89d472499 (diff) | |
Merge branch 'master' into stable
Diffstat (limited to 'LibOVR/Src/OVR_DeviceImpl.h')
| -rw-r--r-- | LibOVR/Src/OVR_DeviceImpl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/LibOVR/Src/OVR_DeviceImpl.h b/LibOVR/Src/OVR_DeviceImpl.h index 2273d3d..e61e37b 100644 --- a/LibOVR/Src/OVR_DeviceImpl.h +++ b/LibOVR/Src/OVR_DeviceImpl.h @@ -350,7 +350,7 @@ public: virtual void Shutdown(); - // Every DeviceManager has an associated profile manager, which us used to store + // Every DeviceManager has an associated profile manager, which is used to store // user settings that may affect device behavior. virtual ProfileManager* GetProfileManager() const { return pProfileManager.GetPtr(); } |