Skip to content
Snippets Groups Projects
Commit 667d6da9 authored by imcovangent's avatar imcovangent
Browse files

Merge branch 'master' into WingDesignCaseStudy_RCEscriptingUpdate

# Conflicts:
#	pyKADMOS/scripts/WP6_TUDWingDesign_work.py
#	pyKADMOS/scripts/WP6_TUD_WingDesign_XDSM_pdfs/RCG.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign_XDSM_pdfs/XDSM_MDF_Gauss-Seidel.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign_XDSM_pdfs/XDSM_converged-MDA_Gauss-Seidel.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign_vispack/supportFiles/json/graphs.json


Former-commit-id: 16c3744c1792ab0bd4cf7ab51048e250535021d5
parents e917fc90 0e5f83e1
No related branches found
No related tags found
No related merge requests found
Showing
with 37353 additions and 33 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment