diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2018-06-08 10:21:15 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2018-06-11 10:08:30 -0700 |
| commit | ab9e4f9733ec280e21f7fa9666db35e45d2d2d91 (patch) | |
| tree | ded436274efda7a08576f01752d703414534a9b2 | |
| parent | 5fb59f46863c9a7381c89038cfb78375a159c1b7 (diff) | |
| download | mesa-ab9e4f9733ec280e21f7fa9666db35e45d2d2d91.tar.gz | |
cherry-ignore: Add patches from Jason that he rebased on 18.1
These 5 commits don't apply cleanly, so a rebased version was supplied
by Jason.
| -rw-r--r-- | bin/.cherry-ignore | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore index 9228a111273..2d7f0954927 100644 --- a/bin/.cherry-ignore +++ b/bin/.cherry-ignore @@ -1,2 +1,11 @@ d89f58a6b8436b59dcf3b896c0ccddabed3f78fd a7d0c53ab89ca86b705014925214101f5bc4187f + +# These patches are ignored becuase Jason provided a version rebased on the 18.1 +# branch that was pulled instead +# +778e2881a04817e8c10c7a400bf1e37414420194 +3b54dd87f707a0fa40a1555bee64aeb06a381c27 +eeae4851494c16d2a6591550bfa6ef77d887ebe3 +a26693493570a9d0f0fba1be617e01ee7bfff4db +0e7f3febf7e739c075a139ae641d65a0618752f3 |