Merge branch 'master' of git://git.gromacs.org/gromacs
commit4fffecc7c1a2694ba0e829aeccb1dabeb7905b52
authorChristoph Junghans <junghans@mpip-mainz.mpg.de>
Mon, 9 Aug 2010 09:53:36 +0000 (9 11:53 +0200)
committerChristoph Junghans <junghans@mpip-mainz.mpg.de>
Mon, 9 Aug 2010 09:53:36 +0000 (9 11:53 +0200)
tree37b53fc9a782384babb875ddf5978a435312d21c
parent7f07ed144358aaf12f0d8d85156c0ee08e3700d3
parent9d5d6e72143ed54459069cc06490a65905a760ee
Merge branch 'master' of git://git.gromacs.org/gromacs
12 files changed:
configure.ac
include/types/enums.h
include/types/forcerec.h
include/types/inputrec.h
src/gmxlib/nonbonded/nonbonded.c
src/gmxlib/tpxio.c
src/gmxlib/txtdump.c
src/kernel/readir.c
src/kernel/tpbcmp.c
src/mdlib/Makefile.am
src/mdlib/forcerec.c
src/tools/gmx_membed.c