Merge branch 'master' into rotation
commitc3d07ea004f3d907b4744305c067ac6207c7844d
authorCarsten Kutzner <ckutzne@ckutzne.mpibpc.intern>
Mon, 19 Jul 2010 15:51:11 +0000 (19 17:51 +0200)
committerCarsten Kutzner <ckutzne@ckutzne.mpibpc.intern>
Mon, 19 Jul 2010 15:51:11 +0000 (19 17:51 +0200)
treebb571e119b0d0d8e2f22bd7b33cee98c77104620
parentf38d1b799f66d7a3884e9457d355532278422160
parent899970e20a2b7aec43dced0cccf88c1479a5c553
Merge branch 'master' into rotation
src/kernel/mdrun.c
src/tools/gmx_tune_pme.c