Skip to content
Snippets Groups Projects
Commit 73b27493 authored by Tobias Frisch's avatar Tobias Frisch
Browse files

Merge branch 'develop' into '22-resource-management' 

# Conflicts:
#   config/Sources.cmake
#   include/vkcv/Core.hpp
parents ae06cc85 81bfa2d9
No related branches found
No related tags found
1 merge request!18Resolve "Resource Management"
Pipeline #24920 passed
Stage: build
Stage: deploy
This commit is part of merge request !18. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
Showing
with 569 additions and 47 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment