Merge branch 'master' into rotation
authorCarsten Kutzner <ckutzne@gwdg.de>
Mon, 21 Sep 2009 12:30:41 +0000 (14:30 +0200)
committerCarsten Kutzner <ckutzne@gwdg.de>
Mon, 21 Sep 2009 12:30:41 +0000 (14:30 +0200)
commit94c515e6e29a6cdac4fcaf6be91ff3662b8b63ac
tree731e2e8609428a23e620112157ff52c90f98bc98
parent5751446f0cf4029f9346fa3ae4bfe3f9d92da3d3
parentf5567feb5590d717638d72c87f9434847de46e6d
Merge branch 'master' into rotation
include/types/enums.h
src/gmxlib/names.c
src/gmxlib/network.c
src/kernel/mdrun.c
src/kernel/readir.c
src/kernel/readir.h
src/mdlib/Makefile.am
src/mdlib/sim_util.c