[python-control-developers] [python-control/python-control] 8ada9b: Ignore .idea pycharm files

[Richard M. <mu...@cd...>]

  Branch: refs/heads/master
  Home:   https://github.com/python-control/python-control
  Commit: 8ada9b21f7f2b824a2d633a9f4140e5a44d14e0d
      https://github.com/python-control/python-control/commit/8ada9b21f7f2b824a2d633a9f4140e5a44d14e0d
  Author: KronosKoderS <mer...@gm...>
  Date:   2016-05-04 (Wed, 04 May 2016)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Ignore .idea pycharm files


  Commit: a660fbd5514967e5710190567bd0081e00a6b1f6
      https://github.com/python-control/python-control/commit/a660fbd5514967e5710190567bd0081e00a6b1f6
  Author: KronosKoderS <mer...@gm...>
  Date:   2016-05-04 (Wed, 04 May 2016)

  Changed paths:
    M control/matlab/timeresp.py
    M control/timeresp.py

  Log Message:
  -----------
  Added return_x to step_response

Added the ability to return the individual x variable responses from the
step_response function.  Also updated matlab version to match matlab
returns.


  Commit: e42b9736256725ae0c509a395834086e9e19904f
      https://github.com/python-control/python-control/commit/e42b9736256725ae0c509a395834086e9e19904f
  Author: Richard Murray <mu...@cd...>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M .gitignore
    M control/matlab/timeresp.py
    M control/timeresp.py

  Log Message:
  -----------
  resolved minor conflict


  Commit: 8273a7f7ce7c2c169922f150656b1af18f6e142f
      https://github.com/python-control/python-control/commit/8273a7f7ce7c2c169922f150656b1af18f6e142f
  Author: Richard Murray <mu...@cd...>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M .gitignore
    M control/matlab/timeresp.py
    M control/timeresp.py

  Log Message:
  -----------
  Merge branch 'KronosKoderS-master'


Compare: https://github.com/python-control/python-control/compare/00f6d5e057db...8273a7f7ce7c