Merge branch 'master' of git://git.gromacs.org/gromacs
commit2c627169b896656d5fc86fcaa2fca7f69570d392
authorChristoph Junghans <junghans@mpip-mainz.mpg.de>
Thu, 17 Jun 2010 15:30:05 +0000 (17 17:30 +0200)
committerChristoph Junghans <junghans@mpip-mainz.mpg.de>
Thu, 17 Jun 2010 15:30:05 +0000 (17 17:30 +0200)
tree2172ec4cca3160a987652b52820cb319a561c20f
parentf18eed3181464af0a509494a9feee43f220e6d5b
parent6816715ac759fc7650f04008d3849c545fb9ea90
Merge branch 'master' of git://git.gromacs.org/gromacs
include/force.h
src/kernel/mdrun.c
src/kernel/readir.c
src/kernel/runner.c
src/mdlib/forcerec.c
src/mdlib/sim_util.c
src/tools/gmx_tune_pme.c