projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9e0a55b 59febde)
resolve merge conflicts of 59febde9 to deqp-dev
authorMika Isojärvi <misojarvi@google.com>
Thu, 24 Aug 2017 17:13:34 +0000 (10:13 -0700)
committerMika Isojärvi <misojarvi@google.com>
Thu, 24 Aug 2017 17:13:34 +0000 (10:13 -0700)
Test: python scripts/check_build_sanity.py
Change-Id: I6fa14e6831bdb54ee33f92521f385ef6b7586580


Trivial merge
Domain: Graphics System / GL;