Merge branch 'master' into 162-163-fix-timestamp-issues
authorRocky Shi <ninshi01@rockyshi-pc.shanghai.arm.com>
Wed, 13 Jan 2016 07:12:46 +0000 (15:12 +0800)
committerRocky Shi <ninshi01@rockyshi-pc.shanghai.arm.com>
Wed, 13 Jan 2016 07:12:46 +0000 (15:12 +0800)
commitdee998bc93247c16de1ca8eed3b797064cd3083d
treedce9dbce4803cf6904ef95d04306d0155b0ceb23
parentcf4916e3c45dba85dfb2b58cf67f3051a507a4de
parent5eb6d048d225659f4e7f457511c5ec83dada3bb4
Merge branch 'master' into 162-163-fix-timestamp-issues

Resolve conflict in vktPipelineTimestampTests.cpp.
external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp