Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

VkCV Framework
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

37e58cbc

Commit 37e58cbc authored 3 years ago by Susanne Dötsch

Downloads
- Patches
- Plain Diff

[#63] Fixed all merge bugs

parent 1944afeb

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

projects/first_mesh/src/main.cpp 8 additions, 8 deletions

projects/first_mesh/src/main.cpp
projects/first_scene/resources/Sponza/Sponza.bin 1 addition, 1 deletion

projects/first_scene/resources/Sponza/Sponza.bin
projects/first_scene/resources/Sponza/Sponza.gltf 2 additions, 2 deletions

projects/first_scene/resources/Sponza/Sponza.gltf
projects/first_scene/src/main.cpp 83 additions, 69 deletions

projects/first_scene/src/main.cpp

with 94 additions and 80 deletions

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 sign in to comment