tree cf6b66a021d9118f8a6d4fd47ef6c175c9176a3e
parent a7d7769959208d44f5c9f9bfe8584b854ad61012
parent 3b392258e26b5d0b4fa895ebb2434e1872e8d4e6
author Adam Sawicki <Adam.Sawicki@amd.com> 1544012432 +0100
committer Adam Sawicki <Adam.Sawicki@amd.com> 1544012432 +0100

Merge branch 'master' into sparse_binding_example

# Conflicts:
#	docs/html/vk__mem__alloc_8h.html
#	docs/html/vk__mem__alloc_8h_source.html
#	src/Tests.cpp
#	src/VulkanSample.cpp
#	src/vk_mem_alloc.h