diff options
author | marha <marha@users.sourceforge.net> | 2012-05-15 15:07:22 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-05-15 15:07:22 +0200 |
commit | 9818207986d5db9831e43eb2a640be68f54bb2ef (patch) | |
tree | e1ac6d17b2da887a2110c1337f01fc6fbdfa68fd /xorg-server/hw/xfree86/common | |
parent | e6ff1fe09702cb307729b3208175c84f623f2968 (diff) | |
parent | 062c45ff0df6a52080dcd74433710d47127cbe29 (diff) | |
download | vcxsrv-9818207986d5db9831e43eb2a640be68f54bb2ef.tar.gz vcxsrv-9818207986d5db9831e43eb2a640be68f54bb2ef.tar.bz2 vcxsrv-9818207986d5db9831e43eb2a640be68f54bb2ef.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/hw/xfree86/common')
-rw-r--r-- | xorg-server/hw/xfree86/common/xf86xv.c | 1 | ||||
-rw-r--r-- | xorg-server/hw/xfree86/common/xf86xvmc.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86xv.c b/xorg-server/hw/xfree86/common/xf86xv.c index 88e2f314b..0e5b0cf0f 100644 --- a/xorg-server/hw/xfree86/common/xf86xv.c +++ b/xorg-server/hw/xfree86/common/xf86xv.c @@ -51,7 +51,6 @@ #include <X11/extensions/Xv.h> #include <X11/extensions/Xvproto.h> #include "xvdix.h" -#include "xvmodproc.h" #include "xf86xvpriv.h" diff --git a/xorg-server/hw/xfree86/common/xf86xvmc.c b/xorg-server/hw/xfree86/common/xf86xvmc.c index e58465289..7321efa43 100644 --- a/xorg-server/hw/xfree86/common/xf86xvmc.c +++ b/xorg-server/hw/xfree86/common/xf86xvmc.c @@ -40,8 +40,6 @@ #include "resource.h" #include "dixstruct.h" -#include "xvmodproc.h" - #include "xf86xvpriv.h" #include "xf86xvmc.h" |