Merge branch release-5-1 into master
authorMark Abraham <mark.j.abraham@gmail.com>
Tue, 6 Oct 2015 12:24:35 +0000 (14:24 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Wed, 7 Oct 2015 11:33:43 +0000 (13:33 +0200)
commitd781c2f014f71733ddf1868faed5bbdf7ef271bf
tree6959fb0c590c8158e3c9ff475bf53f824dd02a3b
parent009f2bd7e12ae1288c08e02a5e82f3c23666ef02
parent5e7f510750a2c546d3489d845c1cc3a5e1630225
Merge branch release-5-1 into master

No conflicts

Change-Id: I04b62299c5550ddf67a54ab8d6c278e7b60810ae
src/gromacs/gmxana/dlist.cpp
src/gromacs/gmxana/gmx_energy.cpp
src/gromacs/gmxana/gmx_wham.cpp
src/gromacs/gmxlib/copyrite.cpp
src/gromacs/swap/swapcoords.cpp
src/programs/mdrun/runner.cpp