Merge branch 'release-4-5-patches' of git@git.gromacs.org:gromacs into release-4...
commit66358ebf664fce5ffb701efec3c4bf9d4e8ce226
authorDavid van der Spoel <spoel@anfinsen.bmc.uu.se>
Wed, 26 Jan 2011 19:56:23 +0000 (26 20:56 +0100)
committerDavid van der Spoel <spoel@anfinsen.bmc.uu.se>
Wed, 26 Jan 2011 19:56:23 +0000 (26 20:56 +0100)
tree49e6c0794143b3568f667448ac9fe57031b46475
parentf211ed88aa7e3ef3d8218772de3ae7cd921aa34b
parentaedcaacf1831ecb2f418b57dca36e31fd6c8d4a2
Merge branch 'release-4-5-patches' of git@git.gromacs.org:gromacs into release-4-5-patches
src/tools/gmx_dipoles.c
src/tools/gmx_energy.c