aboutsummaryrefslogtreecommitdiff
path: root/mesalib/bin
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-11-19 10:47:23 +0100
committermarha <marha@users.sourceforge.net>2012-11-19 10:47:23 +0100
commitb3e1e62c45f525cdd332073aaa34d8452cb23374 (patch)
tree221ee6420074033279921fadc971d30d63d6847b /mesalib/bin
parentb142593315b909b9e202f0f4585b96bf2e74b9db (diff)
downloadvcxsrv-b3e1e62c45f525cdd332073aaa34d8452cb23374.tar.gz
vcxsrv-b3e1e62c45f525cdd332073aaa34d8452cb23374.tar.bz2
vcxsrv-b3e1e62c45f525cdd332073aaa34d8452cb23374.zip
git update 19 nov 2012
fontconfig: c20ac78b01df3f0919352bba16b5b48b3b5d4d6d libxcb: 76a2166de9c80b35f987fdc3f3a228bafa0de94e mesa: ddb901fbf4489ffcd85d3320f23913eb1d4fbdfe pixman: 44dd746bb68625b2f6be77c3f80292b45defe9d7 xserver: 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea xkeyboard-config: 709e05c069428236ca2567e784c9971eecc8ca50
Diffstat (limited to 'mesalib/bin')
-rw-r--r--mesalib/bin/get-pick-list.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/bin/get-pick-list.sh b/mesalib/bin/get-pick-list.sh
index 72880907b..a141afe26 100644
--- a/mesalib/bin/get-pick-list.sh
+++ b/mesalib/bin/get-pick-list.sh
@@ -12,8 +12,8 @@ git log --reverse --pretty=%H -i --grep='^[[:space:]]*NOTE: This is a candidate'
while read sha
do
# Check to see whether the patch is on the ignore list.
- if [ -f .git/cherry-ignore ] ; then
- if grep -q ^$sha .git/cherry-ignore ; then
+ if [ -f bin/.cherry-ignore ] ; then
+ if grep -q ^$sha bin/.cherry-ignore ; then
continue
fi
fi