projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8a338fb d4891ae)
resolve merge conflicts of d4891aeb to deqp-dev
authorPyry Haulos <phaulos@google.com>
Sat, 1 Apr 2017 01:13:37 +0000 (18:13 -0700)
committerPyry Haulos <phaulos@google.com>
Sat, 1 Apr 2017 01:13:37 +0000 (18:13 -0700)
Change-Id: Ie6cd425a775a25dc090c072b5a2e11dfe7868ec7


Trivial merge
Domain: Graphics System / GL;