Merge branch '1.0-wsi_extensions' of gitlab.khronos.org:vulkan/Vulkan-Docs into 1.0-wsi_extensions

Conflicts:
	doc/specs/vulkan/appendices/VK_KHR_surface/vk_khr_surface.txt
This commit is contained in:
Jon Leech 2016-05-13 17:29:43 -07:00
commit ec9be46b64

Diff Content Not Available