projects / platform / upstream / VK-GL-CTS.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8b5b142 eb48f49)
resolve merge conflicts of eb48f49dd to oc-dev
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:17:01 +0000 (09:17 -0700)
committerPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:24:44 +0000 (09:24 -0700)
commit7e37841e4fbdc3835da8dc38736c0ec2e2a7fab7
treeffd155182ffbfaf0a98a22a38b173ac4e43bbd32tree | snapshot
parent8b5b1427f40476a2802ada23b142eca930857789commit | diff
parenteb48f49ddca2af68c2a7a55c58c68106813df33bcommit | diff
resolve merge conflicts of eb48f49dd to oc-dev

Test: scripts/check_build_sanity.py
Change-Id: Iebca655530a000eb96e744fae44a4a9f740c91af
modules/glshared/glsFboCompletenessTests.cpp diff1 | diff2 | blob | history
Domain: Graphics System / GL;