Merge branch 'master' into rotation
commit28ec74bb1fbf3331797ef4bd570333d91fdd5b3a
authorCarsten Kutzner <ckutzne@gwdg.de>
Thu, 3 Sep 2009 10:49:03 +0000 (3 12:49 +0200)
committerCarsten Kutzner <ckutzne@gwdg.de>
Thu, 3 Sep 2009 10:49:03 +0000 (3 12:49 +0200)
tree6ae5e53385e745195784ce11af8fbdea5a6545ba
parent5ed0939dcda06410ba472747979d6b7fb23b6590
parent76582e38108180a9a9f7cb89c0257e583b1ba00e
Merge branch 'master' into rotation
include/types/enums.h
include/types/inputrec.h
src/gmxlib/network.c
src/gmxlib/tpxio.c
src/gmxlib/txtdump.c
src/kernel/md.c
src/mdlib/domdec.c
src/mdlib/sim_util.c