Merge branch 'master' into rotation
commit80567eec2fb32cd441cfe89d28b1116991c1c2bc
authorCarsten Kutzner <ckutzne@gwdg.de>
Fri, 23 Oct 2009 11:59:07 +0000 (23 13:59 +0200)
committerCarsten Kutzner <ckutzne@gwdg.de>
Fri, 23 Oct 2009 11:59:07 +0000 (23 13:59 +0200)
treea3c0ec187f3bff13054c70309bcdfb1106f6c086
parent0830636376eb7e2a0fba987a5072ed287b92ce11
parent672780e98e9a42cd54df0bd11d86c659cb4cbb25
Merge branch 'master' into rotation
src/gmxlib/tpxio.c
src/kernel/md.c
src/kernel/mdrun.c
src/mdlib/sim_util.c