tree 4f8c3b2167f9a77752c914049bf5c136ab8f38ff
parent 14d9e1a93810dfc9e80f367fc669a1b0df112c97
parent c6432d1d4594ddcb9452085240afc49d1ac5e942
author Adam Sawicki <Adam.Sawicki@amd.com> 1537541322 +0200
committer Adam Sawicki <Adam.Sawicki@amd.com> 1537541322 +0200

Merge branch 'allocation_defragmentation_strategies' into development

# Conflicts:
#	docs/html/search/all_f.js
#	docs/html/vk__mem__alloc_8h.html
#	docs/html/vk__mem__alloc_8h_source.html
#	src/vk_mem_alloc.h