Skip to content
Snippets Groups Projects
Commit 8b8a4c30 authored by Mohammad Mahadi Hasan's avatar Mohammad Mahadi Hasan
Browse files

Merge branch 'ParameterModel' 

Conflicts:
	GUI/coregui/mainwindow/mainwindow.cpp
	GUI/coregui/mainwindow/mainwindow.h
parents e8c12703 b0f0d28b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 311 additions and 29 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