Skip to content
Commit 3c7a69e1 authored by Manuel Segimon's avatar Manuel Segimon
Browse files

Merge branch '13-gui' into 'master' 

GUI

Closes #13

See merge request ec504/ec504_projects/group7!8
parents a18c93ca 7c83c077
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment