Merge branch 'master' into pygromacs
[alexxy/gromacs.git] / src / gromacs / gmxana / eigio.cpp