libdrm: updated to 2.4.96

diff --git a/libdrm/.md5sum b/libdrm/.md5sum
index 36e7e657e374a6ccb569730f05debff80365454a..761afbeb425d6fc76319cfcbf11c1a89f0c346fd 100644 (file)
--- a/libdrm/.md5sum
+++ b/libdrm/.md5sum
@@ -1 +1,5 @@
+<<<<<<< HEAD
 41b9ed196a27f5dc7fb88412b704e9fd  libdrm-2.4.95.tar.bz2
+=======
+f296d87272b1befeada3bb135751ab3d  libdrm-2.4.96.tar.bz2
+>>>>>>> libdrm: updated to 2.4.96

diff --git a/libdrm/Pkgfile b/libdrm/Pkgfile
index 042f138d493d6373c618e9c0a1cc060128dd9249..2a72ff812df76602fe9c7bb46f65816613ddfe89 100644 (file)
--- a/libdrm/Pkgfile
+++ b/libdrm/Pkgfile
@@ -5,7 +5,11 @@
 # Depends on: libpthread-stubs xorg-libpciaccess 
 
 name=libdrm
+<<<<<<< HEAD
 version=2.4.95
+=======
+version=2.4.96
+>>>>>>> libdrm: updated to 2.4.96
 release=1
 source=(http://dri.freedesktop.org/libdrm/libdrm-$version.tar.bz2)