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

Merge branch 'develop' into 60-kamera-steuerung-mittels-controller 

# Conflicts:
#	include/vkcv/Window.hpp
#	modules/camera/include/vkcv/camera/CameraManager.hpp
#	modules/camera/src/vkcv/camera/CameraManager.cpp
#	projects/first_triangle/src/main.cpp
#	src/vkcv/Window.cpp
parents e0861bbf 5934e545
No related branches found
No related tags found
1 merge request!65Resolve "Kamera - Steuerung mittels Controller"
Pipeline #25862 passed
Stage: build
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 606 additions and 303 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment