aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin/winmultiwindowwm.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-10-19 21:03:53 +0000
committermarha <marha@users.sourceforge.net>2010-10-19 21:03:53 +0000
commitbe10ad8a9efe4131c14c2dde36adaf11e7b125aa (patch)
tree0a0f9305b181d427c5581f7a072e69e52199bdbb /xorg-server/hw/xwin/winmultiwindowwm.c
parent2197318e5fc026ee57325ce953113d1963e7dc82 (diff)
parent6ab3babba7b1b74528c2194a495fa1e2e67faa55 (diff)
downloadvcxsrv-be10ad8a9efe4131c14c2dde36adaf11e7b125aa.tar.gz
vcxsrv-be10ad8a9efe4131c14c2dde36adaf11e7b125aa.tar.bz2
vcxsrv-be10ad8a9efe4131c14c2dde36adaf11e7b125aa.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xwin/winmultiwindowwm.c')
-rw-r--r--xorg-server/hw/xwin/winmultiwindowwm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/xwin/winmultiwindowwm.c b/xorg-server/hw/xwin/winmultiwindowwm.c
index b5b0fef84..0f3e36504 100644
--- a/xorg-server/hw/xwin/winmultiwindowwm.c
+++ b/xorg-server/hw/xwin/winmultiwindowwm.c
@@ -586,7 +586,7 @@ winMultiWindowWMProc (void *pArg)
winDebug ("winMultiWindowWMProc ()\n");
- /* Loop until we explicity break out */
+ /* Loop until we explicitly break out */
for (;;)
{
WMMsgNodePtr pNode;
@@ -1531,7 +1531,7 @@ winApplyHints (Display *pDisplay, Window iWindow, HWND hWnd, HWND *zstyle)
int format;
unsigned long hint = 0, maxmin = 0, style, nitems = 0 , left = 0;
WindowPtr pWin = GetProp (hWnd, WIN_WINDOW_PROP);
- MwmHints *mwm_hint = NULL;
+ MwmHints *mwm_hint = NULL;
WinXSizeHints SizeHints;
if (!hWnd) return;