OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2ac59aa
)
fixup! cherry-ignore: add a bunch more commits to the list
author
Emil Velikov
<emil.l.velikov@gmail.com>
Wed, 2 Aug 2017 23:13:19 +0000
(
00:13
+0100)
committer
Emil Velikov
<emil.l.velikov@gmail.com>
Wed, 2 Aug 2017 23:19:07 +0000
(
00:19
+0100)
bin/.cherry-ignore
patch
|
blob
|
history
diff --git
a/bin/.cherry-ignore
b/bin/.cherry-ignore
index
9370516
..
25c7482
100644
(file)
--- a/
bin/.cherry-ignore
+++ b/
bin/.cherry-ignore
@@
-77,4
+77,3
@@
be5773fa8dfe9255d9abaf5c7d5bbbd2d922da08 Android: fix compile error for DRI2 loa
# stable: Commit was never applied - see above.
d85802e501a67e193a4a363cfe3b4c17c3d9e2e9 Revert "st/mesa: release sampler views when redefining a texture in st_context_teximage"
->>>>>>> 6a7d67b7ac0... cherry-ignore: add a bunch more commits to the list