Merge branch 'master' into rotation
commit65c9fefcdbe6e1a148bf8a460dbb7d4f41566bf6
authorCarsten Kutzner <ckutzne@gwdg.de>
Fri, 20 Nov 2009 09:55:22 +0000 (20 10:55 +0100)
committerCarsten Kutzner <ckutzne@gwdg.de>
Fri, 20 Nov 2009 09:55:22 +0000 (20 10:55 +0100)
tree0e226539169765577766fe54160eed813be6629f
parent3686b7f8254d6940bf03ae6f972afcd452e3a150
parent8dee965f31a4a3a7e195d83fc2467452b5425fac
Merge branch 'master' into rotation
src/gmxlib/tpxio.c
src/kernel/readir.c