Branch: refs/heads/master
Home: https://github.com/python-control/python-control
Commit: 28204cc85f6bee8190f40af23cb6edfae14aedb6
https://github.com/python-control/python-control/commit/28204cc85f6bee8190f40af23cb6edfae14aedb6
Author: Richard Murray <mu...@cd...>
Date: 2018-01-12 (Fri, 12 Jan 2018)
Changed paths:
M .gitignore
M .travis.yml
M conda-recipe/meta.yaml
M control/bdalg.py
M control/ctrlutil.py
M control/frdata.py
M control/freqplot.py
M control/lti.py
M control/margins.py
M control/matlab/wrappers.py
M control/rlocus.py
M control/robust.py
M control/statefbk.py
M control/statesp.py
A control/statesp.py+
M control/tests/bdalg_test.py
A control/tests/input_element_int_test.py
M control/tests/lti_test.py
M control/tests/matlab_test.py
M control/tests/robust_test.py
M control/tests/statefbk_test.py
M control/tests/statesp_test.py
A control/tests/xferfcn_input_test.py
M control/tests/xferfcn_test.py
M control/timeresp.py
M control/xferfcn.py
M doc/control.rst
M doc/conventions.rst
A examples/robust_mimo.py
A examples/robust_siso.py
M make_version.py
Log Message:
-----------
Merge branch 'master' of https://github.com/python-control/python-control
Commit: 10e8f4720da51768abd2deb95fc840653bdadc08
https://github.com/python-control/python-control/commit/10e8f4720da51768abd2deb95fc840653bdadc08
Author: Richard Murray <mu...@cd...>
Date: 2018-01-12 (Fri, 12 Jan 2018)
Changed paths:
R control/statesp.py+
Log Message:
-----------
TRV: remove extraneous file
Compare: https://github.com/python-control/python-control/compare/bb65f314e642...10e8f4720da5 |
