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

Merge branch 'develop' into 35-kamera-erstellung-und-handling 

# Conflicts:
#	projects/first_triangle/src/main.cpp
#	src/vkcv/Core.cpp
parents f4242222 47938552
No related branches found
No related tags found
1 merge request!26Resolve "Kamera - Erstellung und Handling"
Pipeline #25158 passed
Stage: build
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 971 additions and 282 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment