Merge branch 'master' of git://git.gromacs.org/gromacs
commiteb0b8205e4e8855bff2c05e418ea886932c5d33e
authorChristoph Junghans <junghans@mpip-mainz.mpg.de>
Thu, 19 Aug 2010 10:16:03 +0000 (19 12:16 +0200)
committerChristoph Junghans <junghans@mpip-mainz.mpg.de>
Thu, 19 Aug 2010 10:16:03 +0000 (19 12:16 +0200)
treeaae9e7e21e2fede4487b48937f913900f5ab03d0
parentc6dadb106b19b958b4661d56a7748c7172a2488e
parent974c2df309f00f483499b0f0f9f5fb3c83aa3d2c
Merge branch 'master' of git://git.gromacs.org/gromacs
19 files changed:
configure.ac
include/nonbonded.h
include/types/forcerec.h
src/gmxlib/CMakeLists.txt
src/gmxlib/nonbonded/nonbonded.c
src/gmxlib/tpxio.c
src/gmxlib/txtdump.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/ns.c
src/mdlib/sim_util.c
src/mdlib/tables.c
src/tools/calcpot.c
src/tools/gmx_disre.c
src/tools/gmx_membed.c