diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-14 08:34:43 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-14 08:34:43 +0100 |
| commit | 9837797b353b2e24e7ac96d3a74159497410c21a (patch) | |
| tree | 3d4b6d9eb5e91d8b838610c1a04d738ad7f8ced4 /xorg-server/include | |
| parent | cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b (diff) | |
| parent | 4c9f1ba041644329543e4ca21c0d95cf872f988e (diff) | |
| download | vcxsrv-9837797b353b2e24e7ac96d3a74159497410c21a.tar.gz vcxsrv-9837797b353b2e24e7ac96d3a74159497410c21a.tar.bz2 vcxsrv-9837797b353b2e24e7ac96d3a74159497410c21a.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xserver git update 14 nov 2013
Diffstat (limited to 'xorg-server/include')
| -rw-r--r-- | xorg-server/include/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/include/Makefile.am b/xorg-server/include/Makefile.am index 13d91e22c..93d8616f2 100644 --- a/xorg-server/include/Makefile.am +++ b/xorg-server/include/Makefile.am @@ -2,7 +2,6 @@ if XORG sdk_HEADERS = \ XIstubs.h \ Xprintf.h \ - busfault.h \ callback.h \ client.h \ closestr.h \ @@ -69,6 +68,7 @@ endif AM_CFLAGS = $(DIX_CFLAGS) EXTRA_DIST = \ + busfault.h \ dix-config-apple-verbatim.h \ dixfontstubs.h eventconvert.h eventstr.h inpututils.h \ protocol-versions.h \ |