Merge branch 'master' of git://git.gromacs.org/gromacs into for_upstream
commitea2bb3f62d36ab9b6974f5d63fef09f8bf10efa9
authorChristoph Junghans <junghans@mpip-mainz.mpg.de>
Fri, 2 Oct 2009 15:55:06 +0000 (2 17:55 +0200)
committerChristoph Junghans <junghans@mpip-mainz.mpg.de>
Fri, 2 Oct 2009 15:55:06 +0000 (2 17:55 +0200)
treedbc98941f3afe7ae303ae0ce83667a9dfaccdbc6
parent434cc4b6b76bc8679d18643c596c838f2410c405
parent759d8785c0e74a9fd382e5e8cec9297a384d4004
Merge branch 'master' of git://git.gromacs.org/gromacs into for_upstream
src/mdlib/ns.c