diff options
| author | Carl Worth <cworth@cworth.org> | 2014-05-16 17:22:12 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2014-05-16 17:22:12 -0700 |
| commit | 507d2e523ca81823d07e593d08ab6bfb261ceb88 (patch) | |
| tree | ec15ed81ae0797eeaf66c6c2098cc479237f7f81 | |
| parent | 07ada102cba0e9f0b826cc4cdad0a1398274d6b2 (diff) | |
| download | mesa-507d2e523ca81823d07e593d08ab6bfb261ceb88.tar.gz | |
cherry-ignore: Roland and Michel agreed to drop these patches.
The first was apparently not entirely suitable for stable, (and buggy). And
the second existed only to fix a bug in the first. So without the first, we
don't need either.
| -rw-r--r-- | bin/.cherry-ignore | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore index 756da193b2c..51effb978b8 100644 --- a/bin/.cherry-ignore +++ b/bin/.cherry-ignore @@ -7,3 +7,9 @@ ac35ded4733883037316d556af596524e5e02535 # This patch introduces some regressions. See: # https://bugs.freedesktop.org/show_bug.cgi?id=77443 1afe3359258a9e89b62c8638761f52d78f6d1cbc + +# Author retracted this from consideration for stable branch +3e817e7e56806d8adb8f16c35136045c29908944 + +# And this one was simply a bug fix for the previously-retracted commit +2bab95973d8ad3a84f62670143d6f26c230d9582 |