Merge remote-tracking branch 'gitlab/master' into dynamic_state_tests
authorscygan <slawomir.cygan@intel.com>
Wed, 9 Dec 2015 15:51:02 +0000 (16:51 +0100)
committerscygan <slawomir.cygan@intel.com>
Wed, 9 Dec 2015 15:51:02 +0000 (16:51 +0100)
commit56b5b21ba5d96aa6046d09b59c52f8b0cb2b9408
treee78a9194621438e8ba5f5215a63f76b9fa50276d
parent4b9229de0ea1993c94c91016ba3f955509753fb0
parent111c07b6a6ce0642379b631133a81ff0a6835ee5
Merge remote-tracking branch 'gitlab/master' into dynamic_state_tests

Conflicts:
external/vulkancts/modules/vulkan/vktTestPackage.cpp
external/vulkancts/modules/vulkan/vktTestPackage.cpp