Merge branch 'master' of git://git.gromacs.org/gromacs
commit9d39320c33f4d1ac8afa94ce5a76e86a6570933d
authorChristoph Junghans <junghans@mpip-mainz.mpg.de>
Tue, 6 Jul 2010 11:38:47 +0000 (6 13:38 +0200)
committerChristoph Junghans <junghans@mpip-mainz.mpg.de>
Tue, 6 Jul 2010 11:38:47 +0000 (6 13:38 +0200)
tree04c5c574e5514f110e5010dec5f2c6cd99a9e343
parent2c627169b896656d5fc86fcaa2fca7f69570d392
parentfba176d04d199183efb400ac998b40c9c6507243
Merge branch 'master' of git://git.gromacs.org/gromacs
16 files changed:
configure.ac
include/force.h
include/types/inputrec.h
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/kernel/tpbcmp.c
src/mdlib/Makefile.am
src/mdlib/forcerec.c
src/mdlib/sim_util.c
src/mdlib/tables.c
src/tools/gmx_disre.c
src/tools/gmx_tune_pme.c