Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0.2
authorPyry Haulos <phaulos@google.com>
Thu, 15 Dec 2016 12:24:03 +0000 (04:24 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 15 Dec 2016 12:24:03 +0000 (04:24 -0800)
Change-Id: I5ee52225ed76297caba6ae717e897d7290c20684

1  2 
framework/delibs/cmake/CFlags.cmake

Simple merge