Merge branch 'master' of git://git.gromacs.org/gromacs
commitf18eed3181464af0a509494a9feee43f220e6d5b
authorChristoph Junghans <junghans@mpip-mainz.mpg.de>
Tue, 15 Jun 2010 07:14:07 +0000 (15 09:14 +0200)
committerChristoph Junghans <junghans@mpip-mainz.mpg.de>
Tue, 15 Jun 2010 07:14:07 +0000 (15 09:14 +0200)
tree1dd516650dca3389f2580efb0a1b7f572a8aec47
parent82194e95d9c5b1239ce46ce31785890a18e2bcbe
parentb0726ba25b916c66a22bb7919663525fbf5b0d8d
Merge branch 'master' of git://git.gromacs.org/gromacs
src/kernel/Makefile.am
src/kernel/mdrun.c
src/kernel/readir.c
src/kernel/runner.c
src/kernel/tpbcmp.c
src/mdlib/sim_util.c
src/tools/addconf.c
src/tools/calcpot.c
src/tools/gmx_tune_pme.c