Merge "Merge branch release-5-1"
authorTeemu Murtola <teemu.murtola@gmail.com>
Wed, 27 Apr 2016 12:15:04 +0000 (14:15 +0200)
committerTeemu Murtola <teemu.murtola@gmail.com>
Wed, 27 Apr 2016 12:15:04 +0000 (14:15 +0200)
commitf2efa3d18462ebee43c5150d4f7e30b211ddd8c3
tree47424e8be0cdf6e1b2851bfc35e55557c7967a13
parentf7a1ddfcf732d682351c99db39298f255c2160ae
parent0e9f664b985abfb43af63695978382539473162c
Merge "Merge branch release-5-1"
src/gromacs/ewald/pme-load-balancing.cpp
src/gromacs/gmxpreprocess/readir.cpp
src/programs/mdrun/runner.cpp