Merge branch 'master' into rotation
commit00e5b1dc6aa76302c234c2cdb929d0849d11f6d9
authorCarsten Kutzner <ckutzne@ckutzne.mpibpc.intern>
Tue, 27 Jul 2010 10:02:09 +0000 (27 12:02 +0200)
committerCarsten Kutzner <ckutzne@ckutzne.mpibpc.intern>
Tue, 27 Jul 2010 10:02:09 +0000 (27 12:02 +0200)
treedd4619df066ae58599abb744141bdb5a1516f7db
parent4dd64c39a23278d9fea27d6c07647a5de5b8fa4a
parenteaf37b8268793255a4d50cf1e6bf1022934e1698
Merge branch 'master' into rotation
src/gmxlib/tpxio.c
src/kernel/Makefile.am
src/mdlib/Makefile.am
src/mdlib/domdec.c