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)
1  2 
src/gromacs/ewald/pme-load-balancing.cpp
src/gromacs/gmxpreprocess/readir.cpp
src/programs/mdrun/runner.cpp

Simple merge
Simple merge