diff options
| author | Vlad Glagolev | 2014-05-25 14:33:55 +0400 |
|---|---|---|
| committer | Vlad Glagolev | 2014-05-25 14:33:55 +0400 |
| commit | b30bcaa8675a5b9edfa294f1da426b3ae913f761 (patch) | |
| tree | 30afb9bd828f04a94c8d125faf9948671514a8b7 /xorg-driver/xf86-video-ati/DETAILS | |
| parent | f4c36a2886712a8210c79e357ca9a5922d496bf2 (diff) | |
| parent | 00e964099cae8862eb265215c238b7e42cc2ae12 (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/DETAILS')
| -rwxr-xr-x | xorg-driver/xf86-video-ati/DETAILS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-driver/xf86-video-ati/DETAILS b/xorg-driver/xf86-video-ati/DETAILS index ca772ed93d..834bcc0055 100755 --- a/xorg-driver/xf86-video-ati/DETAILS +++ b/xorg-driver/xf86-video-ati/DETAILS @@ -1,6 +1,6 @@ SPELL=xf86-video-ati -if [[ $ATI_SCM == y ]]; then - if [[ $ATI_AUTO == y ]]; then +if [[ $XF86_VIDEO_ATI_BRANCH == scm ]]; then + if [[ $XF86_VIDEO_ATI_AUTOUPDATE == y ]]; then VERSION=$(date +%Y%m%d) FORCE_DOWNLOAD=on else |