Skip to content
Snippets Groups Projects
Commit c3d085d8 authored by Lorenz Martin Diel's avatar Lorenz Martin Diel
Browse files

Merge branch 'main' into 'lorenz_author' 

# Conflicts:
#   README.md
#   src/game/level/Level.cpp
#   src/game/level/Level.hpp
#   src/game/ui/modals/UnitInfoMenu.cpp
#   src/game/ui/modals/UnitInfoMenu.hpp
parents 0ff5eab8 b7562d0b
No related branches found
No related tags found
1 merge request!53added author tags
Show whitespace changes
Inline Side-by-side
Showing
with 50 additions and 3 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment