diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-06-10 19:38:23 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-06-10 19:38:23 +0300 |
| commit | 080cf9332bc9d71e0e14326bc8efdf06b738dea1 (patch) | |
| tree | e8531a509dca4d8253aa19d89edc68152421f9e5 /intern/ghost/intern/GHOST_SystemWin32.h | |
| parent | 6d495cc4ef071171ff0686b2be898a41e05b8051 (diff) | |
| parent | 9676642cc94599b3419c9aaa5cf1aae2fbbd235f (diff) | |
Merge branch 'gooseberry' into temp_motionpathstemp_motionpaths
Conflicts:
source/blender/blenkernel/intern/object.c
Diffstat (limited to 'intern/ghost/intern/GHOST_SystemWin32.h')
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemWin32.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.h index e615ef164c8..3841ae58b8d 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.h +++ b/intern/ghost/intern/GHOST_SystemWin32.h @@ -182,7 +182,7 @@ public: GHOST_TSuccess getButtons(GHOST_Buttons& buttons) const; /** - * Returns unsinged char from CUT_BUFFER0 + * Returns unsigned char from CUT_BUFFER0 * \param selection Used by X11 only * \return Returns the Clipboard */ |