| commit | f2d3b15d43740eda7298f6ab6482a98812b5b556 | |
| author | Michael Shirts <michael.shirts@virginia.edu> | |
| Wed, 9 Sep 2009 22:26:50 +0000 (9 18:26 -0400) | ||
| committer | Michael Shirts <michael.shirts@virginia.edu> | |
| Wed, 9 Sep 2009 22:28:14 +0000 (9 18:28 -0400) | ||
| tree | 0197513287897ec646c5fa1b9e8e0f4a716a641b | treesnapshot (tar.gz zip) |
| parent | a6ee084bcf3ac87d9dd493702b1c737d86506bdc | commitdiff |
| parent | 1432f837a0055d4f1fbb69db3dc473d47fbc88ab | commitdiff |
Merge branch 'master' of git://git.gromacs.org/gromacs
I synchronized my version with the up-to-date git as of about 9/6/09.
It now gives the same answers as git on the example files, though I didn't
examine all files and options to fine granularity!
Conflicts:
include/constr.h
include/mdrun.h
include/update.h
src/gmxlib/enxio.c
src/kernel/md.c
src/kernel/steep.c
src/mdlib/coupling.c
src/mdlib/mdebin.c
src/mdlib/sim_util.c
src/mdlib/update.c
I synchronized my version with the up-to-date git as of about 9/6/09.
It now gives the same answers as git on the example files, though I didn't
examine all files and options to fine granularity!
Conflicts:
include/constr.h
include/mdrun.h
include/update.h
src/gmxlib/enxio.c
src/kernel/md.c
src/kernel/steep.c
src/mdlib/coupling.c
src/mdlib/mdebin.c
src/mdlib/sim_util.c
src/mdlib/update.c
24 files changed: