Skip to content
Snippets Groups Projects
Commit e4952916 authored by Sebastian Gaida's avatar Sebastian Gaida
Browse files

Merge branch 'develop' into 87-mesh-shader-implementation

# Conflicts:
#	config/lib/vma/vma.cpp
#	include/vkcv/DrawcallRecording.hpp
#	lib/VulkanMemoryAllocator-Hpp
#	modules/scene/CMakeLists.txt
#	projects/CMakeLists.txt
#	src/vkcv/Context.cpp
#	src/vkcv/Core.cpp
#	src/vkcv/DrawcallRecording.cpp
#	src/vkcv/PipelineManager.cpp
parents e411dc41 7d636b62
No related branches found
No related tags found
Loading
Checking pipeline status
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment