Merge branch 'master' into rotation
commit801f2e4413206e5d85666a62dc4cb98495b9addd
authorCarsten Kutzner <ckutzne@gwdg.de>
Wed, 13 Jan 2010 15:20:24 +0000 (13 16:20 +0100)
committerCarsten Kutzner <ckutzne@gwdg.de>
Wed, 13 Jan 2010 15:20:24 +0000 (13 16:20 +0100)
treed35305b4911925c2cf6ae6182cbf4e8d8f4a2dfa
parentf2e83d6eb1813bded5b1a0b14daf1f210bea2249
parent260d40e46f4139f8f60159622996038298aa97e4
Merge branch 'master' into rotation

Conflicts:

src/kernel/md.c
src/mdlib/edsam.c
12 files changed:
include/mpelogging.h
include/types/inputrec.h
src/gmxlib/mvdata.c
src/gmxlib/tpxio.c
src/gmxlib/txtdump.c
src/kernel/Makefile.am
src/kernel/md.c
src/kernel/readir.c
src/mdlib/Makefile.am
src/mdlib/domdec.c
src/mdlib/mdebin.c
src/mdlib/sim_util.c