diff options
| author | marha <marha@users.sourceforge.net> | 2013-03-06 08:39:27 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-03-06 08:39:27 +0100 |
| commit | b5acb643ab1a86b31409900a7c03281fcc48c8e3 (patch) | |
| tree | 85db12bb6d437f616b2f91d547426d0e2d3173e6 /mesalib/bin | |
| parent | 6ddd685990187ec5f5996a16951a3d780c820272 (diff) | |
| parent | 84798668341b15890d625e3bffbbc2d19f434568 (diff) | |
| download | vcxsrv-b5acb643ab1a86b31409900a7c03281fcc48c8e3.tar.gz vcxsrv-b5acb643ab1a86b31409900a7c03281fcc48c8e3.tar.bz2 vcxsrv-b5acb643ab1a86b31409900a7c03281fcc48c8e3.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libfontenc mesa xserver git update 6 Mar 2013
Diffstat (limited to 'mesalib/bin')
| -rw-r--r-- | mesalib/bin/get-pick-list.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/bin/get-pick-list.sh b/mesalib/bin/get-pick-list.sh index a141afe26..d3ac511c1 100644 --- a/mesalib/bin/get-pick-list.sh +++ b/mesalib/bin/get-pick-list.sh @@ -8,7 +8,7 @@ git log --reverse --grep="cherry picked from commit" origin/master..HEAD |\ sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked # Grep for commits that were marked as a candidate for the stable tree. -git log --reverse --pretty=%H -i --grep='^[[:space:]]*NOTE: This is a candidate' HEAD..origin/master |\ +git log --reverse --pretty=%H -i --grep='^[[:space:]]*NOTE: .*[Cc]andidate' HEAD..origin/master |\ while read sha do # Check to see whether the patch is on the ignore list. |