Merge branch 'master' of git://git.gromacs.org/gromacs
commitae917fbf48c028cf3bca3cbf972019417c63ee2c
authorChristoph Junghans <junghans@mpip-mainz.mpg.de>
Tue, 24 Aug 2010 08:15:45 +0000 (24 10:15 +0200)
committerChristoph Junghans <junghans@mpip-mainz.mpg.de>
Tue, 24 Aug 2010 08:15:45 +0000 (24 10:15 +0200)
tree39079274b32c24fb7c6752eea5daaf002ed92ad8
parentb45e7bbed84cacf06b90e6ea73ebfa644295ecd6
parent5e3473a12e722b233f30e469f6747f2eee73429a
Merge branch 'master' of git://git.gromacs.org/gromacs
configure.ac
include/force.h
include/names.h
include/types/enums.h
include/types/forcerec.h
include/types/inputrec.h
include/types/mdatom.h
src/gmxlib/tpxio.c
src/kernel/readir.c
src/mdlib/sim_util.c
src/tools/gmx_membed.c