| commit | 5abdbf9be9e52116d10d2cdc551649d23805a20d | |
| author | Michael Shirts <michael.shirts@virginia.edu> | |
| Wed, 23 Dec 2009 16:27:38 +0000 (23 11:27 -0500) | ||
| committer | Michael Shirts <michael.shirts@virginia.edu> | |
| Wed, 23 Dec 2009 16:27:38 +0000 (23 11:27 -0500) | ||
| tree | 2e3c065c40f10114559da53907194ea8c77b18a4 | treesnapshot (tar.gz zip) |
| parent | c293640eeeedb9c91d9b4a78f625e01f808309ae | commitdiff |
| parent | c27218673c4cb2163f81c5ca64bacbfa848dcfe6 | commitdiff |
Merge branch 'master' of git@git.gromacs.org:gromacs
Conflicts:
include/mdrun.h
include/types/state.h
src/gmxlib/checkpoint.c
src/kernel/md.c
src/kernel/runner.c
src/mdlib/minimize.c
src/mdlib/sim_util.c
Conflicts:
include/mdrun.h
include/types/state.h
src/gmxlib/checkpoint.c
src/kernel/md.c
src/kernel/runner.c
src/mdlib/minimize.c
src/mdlib/sim_util.c
25 files changed: