Merge branch 'release-4-5-patches' of git@git.gromacs.org:gromacs into release-4...
authorDavid van der Spoel <spoel@anfinsen.bmc.uu.se>
Fri, 10 Jun 2011 06:26:11 +0000 (08:26 +0200)
committerDavid van der Spoel <spoel@anfinsen.bmc.uu.se>
Fri, 10 Jun 2011 06:26:11 +0000 (08:26 +0200)
1  2 
src/tools/gmx_energy.c

Simple merge