Merge 42-ubo
authorPyry Haulos <phaulos@google.com>
Thu, 17 Dec 2015 23:38:18 +0000 (15:38 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 17 Dec 2015 23:38:18 +0000 (15:38 -0800)
commit3bd9cfcb1c8007011532ab446c5472ec2747d15d
tree42a353e6e75a628784f3dcd63bc927e2bd741321
parent0644efb693c3612681bda085bcbbdb31a115568b
parent96cbb83d1ce2b72d9a5f620051c63b748c11cca5
Merge 42-ubo
external/vulkancts/modules/vulkan/CMakeLists.txt
external/vulkancts/modules/vulkan/vktTestPackage.cpp