diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-25 17:56:10 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-25 17:56:10 +0100 |
| commit | ba6115f56f066621a20fa545ddd67721afd35523 (patch) | |
| tree | 418b724d4f318d24dc8e5183e6b252922f85f149 /libX11 | |
| parent | eb71c0f23999d1cc156e1821d73634ec79621fc2 (diff) | |
| parent | e0927d908a12c9c140458c355b29b884a7705f2d (diff) | |
| download | vcxsrv-ba6115f56f066621a20fa545ddd67721afd35523.tar.gz vcxsrv-ba6115f56f066621a20fa545ddd67721afd35523.tar.bz2 vcxsrv-ba6115f56f066621a20fa545ddd67721afd35523.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/xwin/InitInput.c
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winglobals.h
xorg-server/hw/xwin/winmsgwindow.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winmultiwindowwndproc.c
Diffstat (limited to 'libX11')
| -rw-r--r-- | libX11/libX11.def | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libX11/libX11.def b/libX11/libX11.def index 9d2977e93..c9d4100e5 100644 --- a/libX11/libX11.def +++ b/libX11/libX11.def @@ -149,6 +149,7 @@ EXPORTS XGetVisualInfo
XGetWindowAttributes
XGetWindowProperty
+ XGetWMClientMachine
XGetWMHints
XGetWMName
XGetWMNormalHints
@@ -357,4 +358,4 @@ EXPORTS XwcTextListToTextProperty
XwcTextPropertyToTextList
XWithdrawWindow
- XWMGeometry
\ No newline at end of file + XWMGeometry
|