projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12eb2eb a18fc4d)
resolve merge conflicts of a18fc4da to deqp-dev
authorMika Isojärvi <misojarvi@google.com>
Thu, 24 Aug 2017 17:39:50 +0000 (10:39 -0700)
committerMika Isojärvi <misojarvi@google.com>
Thu, 24 Aug 2017 17:39:50 +0000 (10:39 -0700)
Test: python scripts/check_build_sanity.py
Change-Id: I005ec911d42238906482a71545df50c395fb23ad


Trivial merge
Domain: Graphics System / GL;