aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin/winmultiwindowclass.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-06-21 10:37:30 +0200
committermarha <marha@users.sourceforge.net>2013-06-21 10:37:30 +0200
commit84f6a75a56f4749f91a51a161c1989cbc8807b80 (patch)
treee72d3e4ee697bb7f35a2dccb6f17edf3a03a6d78 /xorg-server/hw/xwin/winmultiwindowclass.h
parent6ac57d622cdabb2db9f8dce51f0313892e6bd1aa (diff)
parent7f9fb534564d0eb8a62cf444e569a07166e5ee03 (diff)
downloadvcxsrv-84f6a75a56f4749f91a51a161c1989cbc8807b80.tar.gz
vcxsrv-84f6a75a56f4749f91a51a161c1989cbc8807b80.tar.bz2
vcxsrv-84f6a75a56f4749f91a51a161c1989cbc8807b80.zip
Merge remote-tracking branch 'origin/released'
* origin/released: xserver mesa git update 21 June 2013 Conflicts: xorg-server/hw/xwin/windialogs.c xorg-server/hw/xwin/winmultiwindowclass.c
Diffstat (limited to 'xorg-server/hw/xwin/winmultiwindowclass.h')
-rw-r--r--xorg-server/hw/xwin/winmultiwindowclass.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/hw/xwin/winmultiwindowclass.h b/xorg-server/hw/xwin/winmultiwindowclass.h
index 419602154..cb47ce943 100644
--- a/xorg-server/hw/xwin/winmultiwindowclass.h
+++ b/xorg-server/hw/xwin/winmultiwindowclass.h
@@ -108,6 +108,6 @@ int
winMultiWindowGetWMName(WindowPtr pWin, char **wmName);
int
- winMultiWindowGetTransientFor(WindowPtr pWin, WindowPtr *ppDaddy);
+ winMultiWindowGetTransientFor(WindowPtr pWin, Window *ppDaddy);
#endif