diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-08-06 02:45:13 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-08-06 02:45:13 +0400 |
| commit | c689a2ea8c016d3dffda73fc5916ad2717ffc2e1 (patch) | |
| tree | b76bacbe6f109671415e1744abb9dadb929a56b1 /intern/ghost/intern/GHOST_System.h | |
| parent | 2c331302773bfbd725c1a9a102b7e637a46a2a2f (diff) | |
| parent | 4cf531f7a05434a9bbd6144a7ec0314e60aaff40 (diff) | |
Merge remote-tracking branch 'origin/master' into soc-2014-cyclessoc-2014-cycles
Diffstat (limited to 'intern/ghost/intern/GHOST_System.h')
| -rw-r--r-- | intern/ghost/intern/GHOST_System.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h index 57aa0a31c94..ec0022f0a7d 100644 --- a/intern/ghost/intern/GHOST_System.h +++ b/intern/ghost/intern/GHOST_System.h @@ -333,7 +333,7 @@ protected: virtual GHOST_TSuccess createFullScreenWindow(GHOST_Window **window, const GHOST_DisplaySetting &settings, const bool stereoVisual, const GHOST_TUns16 numOfAASamples = 0); - /** The display manager (platform dependant). */ + /** The display manager (platform dependent). */ GHOST_DisplayManager *m_displayManager; /** The timer manager. */ |