projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc65e08 ba45591)
resolve merge conflicts of ba455914 to master
authorPyry Haulos <phaulos@google.com>
Fri, 20 Jan 2017 18:34:24 +0000 (10:34 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 20 Jan 2017 18:34:24 +0000 (10:34 -0800)
Change-Id: Iad350278ba3cf6adcc0fa5e4914e8d98db71a567

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

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