projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: abef761 633ab6f)
resolve merge conflicts of 633ab6f3 to deqp-dev
authorPyry Haulos <phaulos@google.com>
Fri, 12 May 2017 20:46:38 +0000 (13:46 -0700)
committerPyry Haulos <phaulos@google.com>
Fri, 12 May 2017 20:46:38 +0000 (13:46 -0700)
Change-Id: I879838e31c3fc6bbceb102c9b2720a2372360c1a


Trivial merge
Domain: Graphics System / GL;