tree d25b141654b94dc41d3f2ca376686e26003dc990
parent 057040085c234c887ff559b101098050c75856ff
parent 99f2d3543c2b9f0c0c3edbeabf5566c83730fb47
author Adam Sawicki <Adam.Sawicki@amd.com> 1542375417 +0100
committer Adam Sawicki <Adam.Sawicki@amd.com> 1542375417 +0100

Merge branch 'master' into allocation_defragmentation_strategies

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