diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-16 20:49:54 +0100 |
|---|---|---|
| committer | Marc Haesen <marc@hc-consult.be> | 2011-12-16 20:46:08 +0100 |
| commit | 1ae4005bfe3690b34ec40e33918b3e24468d47e1 (patch) | |
| tree | 451bee4796d3058f90af4e66f2cfbdfbe6c77bfe /xorg-server/hw/dmx | |
| parent | 64718ba8bdcecd8d736a48239847b1f9aadd40ea (diff) | |
| parent | 47913e82955ec8e2b1ba4d4b145497dede9163b5 (diff) | |
| download | vcxsrv-1ae4005bfe3690b34ec40e33918b3e24468d47e1.tar.gz vcxsrv-1ae4005bfe3690b34ec40e33918b3e24468d47e1.tar.bz2 vcxsrv-1ae4005bfe3690b34ec40e33918b3e24468d47e1.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/dix/registry.c
xorg-server/include/resource.h
xorg-server/os/access.c
xorg-server/os/auth.c
Diffstat (limited to 'xorg-server/hw/dmx')
| -rw-r--r-- | xorg-server/hw/dmx/glxProxy/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xorg-server/hw/dmx/glxProxy/Makefile.am b/xorg-server/hw/dmx/glxProxy/Makefile.am index 851604883..4ee1036b3 100644 --- a/xorg-server/hw/dmx/glxProxy/Makefile.am +++ b/xorg-server/hw/dmx/glxProxy/Makefile.am @@ -1,10 +1,12 @@ noinst_LIBRARIES = libglxproxy.a libglxproxy_a_SOURCES = compsize.c \ + compsize.h \ g_disptab.c \ g_disptab.h \ global.c \ glxcmds.c \ + glxcmds.h \ glxcmdsswap.c \ glxcontext.h \ glxdrawable.h \ |