Merge branch 'master' of git@git.gromacs.org:gromacs
authorMichael Shirts <michael.shirts@virginia.edu>
Wed, 23 Sep 2009 02:15:34 +0000 (22:15 -0400)
committerMichael Shirts <michael.shirts@virginia.edu>
Wed, 23 Sep 2009 02:15:34 +0000 (22:15 -0400)
commitf8f1735733c8ca704f0dba876f1a4ce902f97b4e
tree8b574f0444fe60946b175287193f5fb38158969c
parentf27d0a58d31d1bf6eb13ab5582c0e4b194a4fa43
parentf5567feb5590d717638d72c87f9434847de46e6d
Merge branch 'master' of git@git.gromacs.org:gromacs
Pull from main repository on 9/22/09
Conflicts:
src/gmxlib/enxio.c
include/types/enums.h
src/gmxlib/enxio.c
src/gmxlib/names.c
src/gmxlib/pbc.c
src/kernel/readir.c
src/mdlib/force.c
src/mdlib/sim_util.c