Merge branch 'master' into rotation
commitda9e011166b3ae327e668af5a0a44952c6032b31
authorCarsten Kutzner <ckutzne@gwdg.de>
Tue, 19 Jan 2010 14:38:44 +0000 (19 15:38 +0100)
committerCarsten Kutzner <ckutzne@gwdg.de>
Tue, 19 Jan 2010 14:38:44 +0000 (19 15:38 +0100)
tree5bd5a24bd1d321063c62380bc9c1c72b6abac1b1
parentaff3888e59287b1b31f0263d1b5e30bec4535ee6
parentcdb932c126ca8791fc0ff8d428db314df4ddd3dc
Merge branch 'master' into rotation
src/gmxlib/tpxio.c
src/mdlib/mdebin.c