diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-23 11:12:22 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-23 11:12:22 +0100 |
| commit | 6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d (patch) | |
| tree | 8dc28411ab42ebb9183bc090c10024a39fc669d6 /xorg-server/dix/Makefile.am | |
| parent | 22891980a76b862bfcda406521b454f072090fb8 (diff) | |
| parent | e22891346b85a7db40dec7260a100f90b451cbc8 (diff) | |
| download | vcxsrv-6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d.tar.gz vcxsrv-6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d.tar.bz2 vcxsrv-6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/glx/dispatch.h
xorg-server/glx/glapi.c
xorg-server/glx/indirect_dispatch.h
xorg-server/glx/indirect_reqsize.c
xorg-server/glx/indirect_reqsize.h
xorg-server/glx/indirect_size.h
xorg-server/glx/indirect_size_get.c
xorg-server/glx/indirect_size_get.h
xorg-server/glx/indirect_table.c
xorg-server/mi/mieq.c
Diffstat (limited to 'xorg-server/dix/Makefile.am')
| -rw-r--r-- | xorg-server/dix/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/xorg-server/dix/Makefile.am b/xorg-server/dix/Makefile.am index f5af619e3..b7358aa72 100644 --- a/xorg-server/dix/Makefile.am +++ b/xorg-server/dix/Makefile.am @@ -39,6 +39,7 @@ libdix_la_SOURCES = \ swaprep.c \ swapreq.c \ tables.c \ + touch.c \ window.c EXTRA_DIST = buildatoms BuiltInAtoms Xserver.d Xserver-dtrace.h.in |