Skip to content
Snippets Groups Projects
Commit b7648380 authored by beuchatp's avatar beuchatp
Browse files

Merge branch 'demo_controller' into 'master' 

Demo controller back into Master (this branch was used for developing nicer GUI and YAML parameter features for giving demonstrations of the system)

See merge request D-FaLL/PandS-System/D-FaLL-System!7
parents 86239927 24e65e7e
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 6844 additions and 821 deletions
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