/[packages]/cauldron/mesa/current/SOURCES/0015-cherry-ignore-Add-commit-that-doesn-t-apply.patch
ViewVC logotype

Contents of /cauldron/mesa/current/SOURCES/0015-cherry-ignore-Add-commit-that-doesn-t-apply.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1379265 - (show annotations) (download)
Wed Mar 20 17:08:42 2019 UTC (2 months ago) by tmb
File size: 830 byte(s)
more fixes from staging/19.0 branch
1 From 12745f5dc0d44e0d33771b42f36140b669e50d5e Mon Sep 17 00:00:00 2001
2 From: Dylan Baker <dylan@pnwbakers.com>
3 Date: Mon, 18 Mar 2019 11:34:41 -0700
4 Subject: [PATCH 15/24] cherry-ignore: Add commit that doesn't apply
5
6 ---
7 bin/.cherry-ignore | 5 ++++-
8 1 file changed, 4 insertions(+), 1 deletion(-)
9
10 diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
11 index 9be68d3b2c3..520cf214645 100644
12 --- a/bin/.cherry-ignore
13 +++ b/bin/.cherry-ignore
14 @@ -11,4 +11,7 @@ b031c643491a92a5574c7a4bd659df33f2d89bb6
15
16 # These were manually rebased by Jason, thanks!
17 8ab95b849e66f3221d80a67eef2ec6e3730901a8
18 -5c30fffeec1732c21d600c036f95f8cdb1bb5487
19 \ No newline at end of file
20 +5c30fffeec1732c21d600c036f95f8cdb1bb5487
21 +
22 +# This doesn't actually appliy to 19.0
23 +29179f58c6ba8099859ea25900214dbbd3814a92
24 \ No newline at end of file
25 --
26 2.21.0
27

  ViewVC Help
Powered by ViewVC 1.1.26