Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

imt2531-exam
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

654416a9

Commit 654416a9 authored 7 years ago by Halvor Smedås

Downloads
- Plain Diff

Resolving merge conflict

parents 3baa4c2d 5322e9db

No related branches found

No related tags found

No related merge requests found

Changes 3

Show whitespace changes

Inline Side-by-side

Showing

assets/scenes/demo1.yml 265 additions, 0 deletions

assets/scenes/demo1.yml
src/EntityNode.cpp 1 addition, 1 deletion

src/EntityNode.cpp
src/Scene.cpp 21 additions, 21 deletions

src/Scene.cpp

with 287 additions and 22 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