Merge branch 'master' of git@git.gromacs.org:gromacs
authorMaarten Wolf <mwolf@adriatica.mpibpc.intern>
Fri, 27 Aug 2010 13:09:42 +0000 (15:09 +0200)
committerMaarten Wolf <mwolf@adriatica.mpibpc.intern>
Fri, 27 Aug 2010 13:09:42 +0000 (15:09 +0200)
commit429bf8a35871074f969f3e938a218f902781cd05
tree46a4dcea12bdb4287fb61f6c78243d8c8fc872c2
parent45181651ad54d66f55ed13ca0d7bacd42c89fd24
parent860cdb58313a3b37d01454b8aa5cd693bf49e2a2
Merge branch 'master' of git@git.gromacs.org:gromacs

Conflicts:

src/kernel/md_openmm.c
src/tools/gmx_membed.c
include/mdrun.h
src/kernel/md.c
src/kernel/md_openmm.c
src/kernel/md_openmm.h
src/kernel/mdrun.c
src/kernel/runner.c
src/mdlib/minimize.c
src/mdlib/tpi.c