Skip to content
Snippets Groups Projects
Commit fd42dc89 authored by zhiyupan's avatar zhiyupan
Browse files

Merge branch 'develop' 

# Conflicts:
#	notebooks/Pysim/Block.py
#	notebooks/Pysim/DTBlock.py
#	notebooks/V01_zeitdiskrete_systeme.ipynb
#	notebooks/V02_die_z-transformation.ipynb
#	notebooks/V04_regelung_diskreter_systeme.ipynb
#	notebooks/V06_normalformen_in_zustandsraumdarstellung.ipynb
#	notebooks/V07_steuerbarkeit_und_beobachtbarkeit.ipynb
parents 3205e847 e5d59331
No related branches found
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 2382 additions and 1356 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment