aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-10-15 16:56:14 +0200
committermarha <marha@users.sourceforge.net>2012-10-15 16:56:14 +0200
commitf15a40afaf6d1b3a4841d25631f947da1b289f89 (patch)
treef2066dc8caaf2fddd3b88251d18839d5878bfd9b /xorg-server/hw/xwin
parentf2a3390c8b2052e8f65d3502dd703b5c5b23a28e (diff)
parent54db46582aba2252d544fa3956522f9ef06b49cb (diff)
downloadvcxsrv-f15a40afaf6d1b3a4841d25631f947da1b289f89.tar.gz
vcxsrv-f15a40afaf6d1b3a4841d25631f947da1b289f89.tar.bz2
vcxsrv-f15a40afaf6d1b3a4841d25631f947da1b289f89.zip
Merge remote-tracking branch 'origin/released'
* origin/released: xserver mesa pixman git update 15 oct 2012 Conflicts: xorg-server/hw/xwin/InitOutput.c
Diffstat (limited to 'xorg-server/hw/xwin')
-rw-r--r--xorg-server/hw/xwin/Makefile.am3
-rw-r--r--xorg-server/hw/xwin/glx/Makefile.am3
2 files changed, 5 insertions, 1 deletions
diff --git a/xorg-server/hw/xwin/Makefile.am b/xorg-server/hw/xwin/Makefile.am
index 50f99b68c..003a9a272 100644
--- a/xorg-server/hw/xwin/Makefile.am
+++ b/xorg-server/hw/xwin/Makefile.am
@@ -109,13 +109,16 @@ SRCS = InitInput.c \
winclipboard.h \
winconfig.h \
win.h \
+ winglobals.h \
winkeybd.h \
winkeynames.h \
winlayouts.h \
winmessages.h \
+ winmonitors.h \
winmsg.h \
winms.h \
winmultiwindowclass.h \
+ winmultiwindowicons.h \
winprefs.h \
winresource.h \
winwindow.h \
diff --git a/xorg-server/hw/xwin/glx/Makefile.am b/xorg-server/hw/xwin/glx/Makefile.am
index 7222a9f21..59f6879a7 100644
--- a/xorg-server/hw/xwin/glx/Makefile.am
+++ b/xorg-server/hw/xwin/glx/Makefile.am
@@ -6,7 +6,8 @@ libXwinGLX_la_SOURCES = \
glwindows.h \
glwrap.c \
indirect.c \
- wgl_ext_api.c
+ wgl_ext_api.c \
+ wgl_ext_api.h
if XWIN_MULTIWINDOW
DEFS_MULTIWINDOW = -DXWIN_MULTIWINDOW