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
This commit is contained in:
Adam Sawicki 2018-09-21 16:48:42 +02:00
commit 3951aa5bc3
14 changed files with 1848 additions and 521 deletions

View file

@ -65,5 +65,6 @@ var menudata={children:[
{text:"v",url:"globals_func.html#index_v"}]},
{text:"Typedefs",url:"globals_type.html"},
{text:"Enumerations",url:"globals_enum.html"},
{text:"Enumerator",url:"globals_eval.html"},
{text:"Enumerator",url:"globals_eval.html",children:[
{text:"v",url:"globals_eval.html#index_v"}]},
{text:"Macros",url:"globals_defs.html"}]}]}]}