diff options
| author | Chih-Wei Huang <cwhuang@linux.org.tw> | 2016-11-25 12:05:07 +0800 |
|---|---|---|
| committer | Chih-Wei Huang <cwhuang@linux.org.tw> | 2016-11-25 12:05:07 +0800 |
| commit | 524121d42bfdf8c1bd3565bd2adb0ffd7b52713f (patch) | |
| tree | 57b645909523126d571949a0cabb16087aca9849 /bin | |
| parent | 5d0d07d402fa0edead26450fb86111292e8f834f (diff) | |
| parent | f7b58a378ca94cf1c2637d640ce5b9fb8f8519a6 (diff) | |
| download | external_mesa3d-524121d42bfdf8c1bd3565bd2adb0ffd7b52713f.zip external_mesa3d-524121d42bfdf8c1bd3565bd2adb0ffd7b52713f.tar.gz external_mesa3d-524121d42bfdf8c1bd3565bd2adb0ffd7b52713f.tar.bz2 | |
Merge remote-tracking branch 'mesa/13.0' into nougat-x86
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/.cherry-ignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore index 194252b..27f5d6d 100644 --- a/bin/.cherry-ignore +++ b/bin/.cherry-ignore @@ -1,2 +1,5 @@ # Commit was picked with -x 907ace57986733add2aebfa9dd7c83c67efed70e mapi: automake: set VISIBILITY_CFLAGS for shared glapi + +# Commit was reverted shortly after it landed in master +a39ad185932eab4f25a0cb2b112c10d8700ef242 configure.ac: honour LLVM_LIBDIR when linking against LLVM |