[Lunar-commits] <moonbase-xorg> Merge branch 'Florin65-drm'

[Stefan Wold]

commit 14ac1b545c506b154b17722a74f051fde7898caa
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Sat, 07 Dec 2013 02:31:51 -0800
URL: https://github.com/lunar-linux/moonbase-xorg/commit/14ac1b545c506b154b17722a74f051fde7898caa

Merge branch 'Florin65-drm'

Conflicts:
	lib/libdrm/DETAILS
---
  lib/libdrm/DETAILS | +3/-3     
  1 file changed, 3 insertions(+), 3 deletions(-)

--- a/lib/libdrm/DETAILS
+++ b/lib/libdrm/DETAILS
@@ -1,12 +1,12 @@
           MODULE=libdrm
-         VERSION=2.4.49
+         VERSION=2.4.50
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=http://dri.freedesktop.org/libdrm
-      SOURCE_VFY=sha1:a8b24b0f90b5f23ad609b0bd7ecb47e5b0ea974c
+      SOURCE_VFY=sha1:404ad8146500fe53aad46e8db5d546fec1ca47ac
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://dri.freedesktop.org
          ENTERED=20061017
-         UPDATED=20131123
+         UPDATED=20131204
            SHORT="The userspace interface to kernel DRM services"
 
 cat << EOF