summaryrefslogtreecommitdiffstats
path: root/xorg-driver/xf86-video-ati/HISTORY
diff options
context:
space:
mode:
authorVlad Glagolev2014-05-25 14:33:55 +0400
committerVlad Glagolev2014-05-25 14:33:55 +0400
commitb30bcaa8675a5b9edfa294f1da426b3ae913f761 (patch)
tree30afb9bd828f04a94c8d125faf9948671514a8b7 /xorg-driver/xf86-video-ati/HISTORY
parentf4c36a2886712a8210c79e357ca9a5922d496bf2 (diff)
parent00e964099cae8862eb265215c238b7e42cc2ae12 (diff)
Merge branch 'master' into devel-xorg-modular
Conflicts: libs/libdrm/HISTORY xorg-driver/xf86-video-ati/PRE_BUILD
Diffstat (limited to 'xorg-driver/xf86-video-ati/HISTORY')
-rw-r--r--xorg-driver/xf86-video-ati/HISTORY4
1 files changed, 4 insertions, 0 deletions
diff --git a/xorg-driver/xf86-video-ati/HISTORY b/xorg-driver/xf86-video-ati/HISTORY
index b6e54e5f4e..88bff95d4a 100644
--- a/xorg-driver/xf86-video-ati/HISTORY
+++ b/xorg-driver/xf86-video-ati/HISTORY
@@ -1,3 +1,7 @@
+2014-05-23 Ismael Luceno <ismael@sourcemage.org>
+ * DEPENDS: SCM branch depends on glamor
+ * DEPENDS, DETAILS, PREPARE, PRE_BUILD: Use prepare_select_branch
+
2014-04-14 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: mesalib => MESALIB