projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
132a3ba
6562b61
)
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
author
Pyry Haulos
<phaulos@google.com>
Thu, 19 Jan 2017 01:25:44 +0000
(17:25 -0800)
committer
Pyry Haulos
<phaulos@google.com>
Thu, 19 Jan 2017 01:25:44 +0000
(17:25 -0800)
Change-Id: I3d62340294affc97744a3f215a96d00bd47342d5
1
2
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
Simple merge