[pyfr] 74/88: Merge remote-tracking branch 'upstream/develop' into develop.

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository pyfr.

commit ca6d6d64b851d321332e0092e08810c02907a362
Merge: bbf76c2 7001e2b
Author: Freddie Witherden <freddie at witherden.org>
Date:   Fri Sep 2 09:17:26 2016 -0700

    Merge remote-tracking branch 'upstream/develop' into develop.

 pyfr/integrators/dual/base.py           |  6 +--
 pyfr/integrators/dual/controllers.py    | 50 +++++++++++++++--
 pyfr/integrators/dual/pseudosteppers.py | 96 ++++++++++++++++-----------------
 pyfr/integrators/dual/steppers.py       |  9 ----
 4 files changed, 96 insertions(+), 65 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyfr.git