Adam Sawicki 0f99b56168 Merge branch 'master' into v2.2 ... # Conflicts: # docs/html/vk__mem__alloc_8h_source.html		2018-12-13 10:48:38 +01:00
..
gfx	Buddy allocation algorithm finished and documented!	2018-09-21 16:44:16 +02:00
html	Merge branch 'master' into v2.2	2018-12-13 10:48:38 +01:00
Recording file format.md	Merge branch 'sparse_binding_example' into v2.2	2018-12-10 14:45:56 +01:00