diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-11 12:00:44 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-11 12:00:44 +0200 |
| commit | db967c2b0fd8506b9e1cf7574d5fb927bec786c5 (patch) | |
| tree | 5444de1e304af7b5ae8c4b590a08b1b5964c7eca /mesalib/configure.ac | |
| parent | 6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab (diff) | |
| parent | 0bef135026040688be97af98cc99cc82f93838e8 (diff) | |
| download | vcxsrv-db967c2b0fd8506b9e1cf7574d5fb927bec786c5.tar.gz vcxsrv-db967c2b0fd8506b9e1cf7574d5fb927bec786c5.tar.bz2 vcxsrv-db967c2b0fd8506b9e1cf7574d5fb927bec786c5.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/devices.c
Diffstat (limited to 'mesalib/configure.ac')
| -rw-r--r-- | mesalib/configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 46265a221..b5250f321 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -33,7 +33,7 @@ USER_CXXFLAGS="$CXXFLAGS" dnl Versions for external dependencies LIBDRM_REQUIRED=2.4.24 LIBDRM_RADEON_REQUIRED=2.4.31 -LIBDRM_INTEL_REQUIRED=2.4.34 +LIBDRM_INTEL_REQUIRED=2.4.37 LIBDRM_NVVIEUX_REQUIRED=2.4.33 LIBDRM_NOUVEAU_REQUIRED=2.4.33 DRI2PROTO_REQUIRED=2.6 |