summaryrefslogtreecommitdiffstats
path: root/xorg-data
diff options
context:
space:
mode:
authorTreeve Jelbert2014-09-25 18:49:15 +0200
committerTreeve Jelbert2014-09-25 18:49:15 +0200
commit270abc29b86e857e7d92d0926a67cc7b97c45acc (patch)
tree91762554b013870a249bcce9467cb921fcdfc12a /xorg-data
parentbfb78bf3026408e88059939906f1231751703cf7 (diff)
parentaccc9b812a427d80050c63a3a299089cd444a1c4 (diff)
Merge remote-tracking branch 'origin/master' into devel-xorg-modular
Conflicts: xorg-driver/xf86-video-ati/DEPENDS xorg-driver/xf86-video-ati/HISTORY xorg-lib/libxaw/HISTORY xorg-lib/libxcb/DEPENDS xorg-lib/libxcb/HISTORY xorg-lib/libxcomposite/HISTORY xorg-lib/libxcursor/HISTORY xorg-lib/libxdamage/HISTORY xorg-lib/libxext/HISTORY xorg-lib/libxfixes/HISTORY xorg-lib/libxft/HISTORY xorg-lib/libxi/HISTORY xorg-lib/libxinerama/HISTORY xorg-lib/libxkbfile/HISTORY xorg-lib/libxmu/HISTORY xorg-lib/libxpm/HISTORY xorg-lib/libxrandr/HISTORY xorg-lib/libxrender/HISTORY xorg-lib/libxres/HISTORY xorg-lib/libxtst/HISTORY xorg-lib/libxv/HISTORY xorg-lib/libxvmc/HISTORY xorg-lib/libxxf86dga/HISTORY xorg-lib/libxxf86vm/HISTORY xorg-proto/kbproto/DEPENDS xorg-xserver/xorg-server/DEPENDS
Diffstat (limited to 'xorg-data')
-rwxr-xr-xxorg-data/xbitmaps/DEPENDS2
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-data/xbitmaps/DEPENDS b/xorg-data/xbitmaps/DEPENDS
index 1b65df7f01..11ee0d0b5a 100755
--- a/xorg-data/xbitmaps/DEPENDS
+++ b/xorg-data/xbitmaps/DEPENDS
@@ -1,2 +1,2 @@
-depends gawk &&
+depends AWK &&
depends util-macros