Merge release-5-0 into release-5-1
authorTeemu Murtola <teemu.murtola@gmail.com>
Mon, 20 Jul 2015 04:15:46 +0000 (07:15 +0300)
committerTeemu Murtola <teemu.murtola@gmail.com>
Mon, 20 Jul 2015 04:16:22 +0000 (07:16 +0300)
commit61ba45d5a1865eace484126b5beeb2ea286fc6d7
treebd74c38c30b248ec7114ade38436591d710d91f6
parent90d9828b356aaa5aeba07424fcc4520ffde4cd2e
parent9457e6db9a4f932f8d1810d645cf292139e39707
Merge release-5-0 into release-5-1

Conflicts:
    src/gromacs/gmxpreprocess/grompp.c (adjacent changes, took both)

Additionally, added a declaration for a variable in sasa.cpp that had
been removed from enclosing scopes.

Change-Id: I15c10ef00416aa1f791a58b97d79669efab9a1c5
src/gromacs/gmxpreprocess/grompp.c
src/gromacs/mdlib/compute_io.c
src/gromacs/mdlib/perf_est.c
src/gromacs/trajectoryanalysis/modules/sasa.cpp