diff options
| author | marha <marha@users.sourceforge.net> | 2014-07-28 21:23:36 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-07-28 21:32:18 +0200 |
| commit | 777fcfa17aafab62719446e00068f5e61ec946d5 (patch) | |
| tree | ca0ed3fea46b207daa6cd5bc05382e2d60a1e87f /mesalib/configure.ac | |
| parent | 61c36feba19d918885022042ea62d068a698c83d (diff) | |
| parent | b33b8d8ae86876b50df96881b96074b3fe177cce (diff) | |
| download | vcxsrv-777fcfa17aafab62719446e00068f5e61ec946d5.tar.gz vcxsrv-777fcfa17aafab62719446e00068f5e61ec946d5.tar.bz2 vcxsrv-777fcfa17aafab62719446e00068f5e61ec946d5.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/include/servermd.h
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 744e55ce3..d06730d34 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -32,7 +32,7 @@ LIBDRM_RADEON_REQUIRED=2.4.54 LIBDRM_INTEL_REQUIRED=2.4.52 LIBDRM_NVVIEUX_REQUIRED=2.4.33 LIBDRM_NOUVEAU_REQUIRED="2.4.33 libdrm >= 2.4.41" -LIBDRM_FREEDRENO_REQUIRED=2.4.51 +LIBDRM_FREEDRENO_REQUIRED=2.4.55 DRI2PROTO_REQUIRED=2.6 DRI3PROTO_REQUIRED=1.0 PRESENTPROTO_REQUIRED=1.0 |