Merge branch 'master' into rotation
commit4dd64c39a23278d9fea27d6c07647a5de5b8fa4a
authorCarsten Kutzner <ckutzne@ckutzne.mpibpc.intern>
Mon, 26 Jul 2010 15:02:44 +0000 (26 17:02 +0200)
committerCarsten Kutzner <ckutzne@ckutzne.mpibpc.intern>
Mon, 26 Jul 2010 15:02:44 +0000 (26 17:02 +0200)
tree7e92c33d97cfe2be1f45e4de380f0e3e4ae8db10
parent7d2ed995cb6f53f4b58cb864ca86b29352a646b4
parenta7502d01dcb74b8d0bafde04677227734cb9f2ea
Merge branch 'master' into rotation
src/gmxlib/tpxio.c
src/kernel/Makefile.am
src/mdlib/Makefile.am
src/mdlib/domdec.c
src/mdlib/mdebin.c
src/mdlib/sim_util.c