Merge branch 'master' of git://git.gromacs.org/gromacs
commit9605c7d6f358e882256f76bd1056edef2f883d29
authorChristoph Junghans <junghans@mpip-mainz.mpg.de>
Sun, 4 Apr 2010 10:39:01 +0000 (4 12:39 +0200)
committerChristoph Junghans <junghans@mpip-mainz.mpg.de>
Sun, 4 Apr 2010 10:39:01 +0000 (4 12:39 +0200)
tree1f75ae86e27c5cb015241ae7d762031e650c3e9b
parent1d91067395ee1b413a78f76d288c0a284fc22174
parent94e7a00cb939f56b92c03b66670bdb427b0afeb9
Merge branch 'master' of git://git.gromacs.org/gromacs
src/kernel/mdrun.c
src/kernel/runner.c