diff options
author | Guillermo S. Romero <gsr.b3d@infernal-iceberg.com> | 2010-12-16 22:05:47 +0300 |
---|---|---|
committer | Guillermo S. Romero <gsr.b3d@infernal-iceberg.com> | 2010-12-16 22:05:47 +0300 |
commit | fef0549ea5f09d5d83066b9c5cc232f8f0b0568a (patch) | |
tree | 048bc4988ff8ef144751c36b2e25d2dd955a34a0 /intern | |
parent | fdcfca54e0471f10413fbcf0ba4efd029a4d563c (diff) |
SVN maintenance.
Plus some typo fixes in comments.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/ghost/intern/GHOST_SystemWin32.cpp | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_WindowX11.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index 371a8bf865b..5ae30d8f948 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -855,7 +855,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, * specifies a character code generated by a dead key. A dead key is a key that * generates a character, such as the umlaut (double-dot), that is combined with * another character to form a composite character. For example, the umlaut-O - * character (Ù) is generated by typing the dead key for the umlaut character, and + * character (Ö) is generated by typing the dead key for the umlaut character, and * then typing the O key. */ case WM_SYSDEADCHAR: diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index e8b2f6f7358..b877470d710 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -176,7 +176,7 @@ GHOST_WindowX11( int attributes[40], i, samples; Atom atoms[2]; int natom; - int glxVersionMajor, glxVersionMinor; // As in GLX major.mino + int glxVersionMajor, glxVersionMinor; // As in GLX major.minor /* initialize incase X11 fails to load */ memset(&m_xtablet, 0, sizeof(m_xtablet)); |