projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d4bf79 e5f7483)
resolve merge conflicts of e5f7483 to master
authorPyry Haulos <phaulos@google.com>
Wed, 19 Oct 2016 16:16:00 +0000 (09:16 -0700)
committerPyry Haulos <phaulos@google.com>
Wed, 19 Oct 2016 16:16:00 +0000 (09:16 -0700)
Change-Id: Id295761e33e8e58447f4b0bc9726f1bb03887d53

1  2 
android/cts/master/gles3-master.txt patch | diff1 | diff2 | blob | history

diff --cc android/cts/master/gles3-master.txt
Simple merge
Domain: Graphics System / GL;