Merge branch 'master' of git://git.gromacs.org/gromacs
commit0fb6fb3bdcc5b19a634ab6a48b1a78e56f080000
authorChristoph Junghans <junghans@mpip-mainz.mpg.de>
Wed, 24 Feb 2010 11:52:45 +0000 (24 12:52 +0100)
committerChristoph Junghans <junghans@mpip-mainz.mpg.de>
Wed, 24 Feb 2010 11:52:45 +0000 (24 12:52 +0100)
treeb4fce57c712cd09169ec65a2cce3d04a034cb1e7
parent4ecfd7e82b88eb8fe16bb7a978f88b067b2e108e
parent00db64ec99e501afd9a84ae07987a34a280bd856
Merge branch 'master' of git://git.gromacs.org/gromacs
configure.ac
src/gmxlib/copyrite.c
src/gmxlib/tpxio.c
src/gmxlib/txtdump.c
src/kernel/grompp.c
src/kernel/mdrun.c
src/kernel/readir.c
src/kernel/runner.c
src/mdlib/forcerec.c
src/mdlib/sim_util.c
src/tools/calcpot.c