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

Merge branch 'units2+xml' into 'xml'

# Conflicts:
#   src/main.cpp
#   src/unit.cpp
parents 60811ac6 1c234b83
No related branches found
No related tags found
1 merge request!9Xml
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment