Merge branch 'master' into rotation
commitfce3db7d7d835a30063146fab1350534522779bf
authorCarsten Kutzner <ckutzne@ckutzne.mpibpc.intern>
Tue, 13 Jul 2010 09:19:49 +0000 (13 11:19 +0200)
committerCarsten Kutzner <ckutzne@ckutzne.mpibpc.intern>
Tue, 13 Jul 2010 09:19:49 +0000 (13 11:19 +0200)
tree30a5916ae2bdd40d8c0e1f625b897a78c860242a
parent2c45a2878b2c1d62ef994476d692dd52db0f2223
parent721405b3c7241d871b35253dd36a27b6ad7a1d95
Merge branch 'master' into rotation
include/types/inputrec.h
src/gmxlib/network.c
src/gmxlib/tpxio.c
src/gmxlib/txtdump.c
src/kernel/readir.c
src/mdlib/domdec.c
src/tools/gmx_tune_pme.c