Source Mage code commit list

[Pol Vinogradov <scm AT sourcemage.org>]

GIT changes to devel-xorg-modular grimoire by Pol Vinogradov 
<vin.public AT gmail.com>:

 xorg-driver/xf86-video-ati/DEPENDS |    7 +------
 xorg-driver/xf86-video-ati/HISTORY |    4 ++++
 2 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 1153382643610a0379d74fb0aca0be10eabaa8ac
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

    xorg-driver/xf86-video-ati: fixed mesalib with DRI request in DEPENDS, 
some cleanup

diff --git a/xorg-driver/xf86-video-ati/DEPENDS 
b/xorg-driver/xf86-video-ati/DEPENDS
index afd1cd8..a3a5c3a 100755
--- a/xorg-driver/xf86-video-ati/DEPENDS
+++ b/xorg-driver/xf86-video-ati/DEPENDS
@@ -7,7 +7,7 @@ depends xineramaproto                        &&
 depends xorg-server                          &&
 depends xproto                               &&
 
-optional_depends  mesalib                    \
+optional_depends -sub DRI  mesalib           \
                   "--enable-dri"             \
                   "--disable-dri"            \
                   "Do you want dri support"  &&
@@ -23,8 +23,3 @@ optional_depends  UDEV  \
                   '--enable-udev'  \
                   '--disable-udev'  \
                   'for libudev hardware detection'
-=======
-if is_depends_enabled $SPELL mesalib ; then
-  sub_depends mesalib DRI
-fi
->>>>>>> origin/master
diff --git a/xorg-driver/xf86-video-ati/HISTORY 
b/xorg-driver/xf86-video-ati/HISTORY
index a079b97..f3719b6 100644
--- a/xorg-driver/xf86-video-ati/HISTORY
+++ b/xorg-driver/xf86-video-ati/HISTORY
@@ -1,3 +1,7 @@
+2014-09-27 Pol Vinogradov <vin.public AT gmail.com>
+       * DEPENDS: simplified mesalib with DRI request, removed merge
+         marks crap
+
 2014-09-25  Treeve Jelbert <treeve AT sourcemage.org>
        * DEPENDS: MESALIB => mesalib