Merge branch 'master' into rotation
commit70be5ef34fd591c3ffee55e8552b84e72fd27b51
authorCarsten Kutzner <ckutzne@ckutzne.mpibpc.intern>
Thu, 29 Jul 2010 08:04:47 +0000 (29 10:04 +0200)
committerCarsten Kutzner <ckutzne@ckutzne.mpibpc.intern>
Thu, 29 Jul 2010 08:04:47 +0000 (29 10:04 +0200)
tree8ea892b550a64f8c2461e0ac80870dda5cc77276
parent97dff906628621fceeb98ab8c1a3d620c6549a76
parenta36c3fa65a1d730b147545e3acb191cba344abdf
Merge branch 'master' into rotation
include/types/inputrec.h
src/mdlib/domdec.c