Merge branch 'master' of git.gromacs.org:gromacs
authorDavid van der Spoel <spoel@xray.bmc.uu.se>
Sun, 16 May 2010 19:52:20 +0000 (21:52 +0200)
committerDavid van der Spoel <spoel@xray.bmc.uu.se>
Sun, 16 May 2010 19:52:20 +0000 (21:52 +0200)
commit1f85efc2e3256ab65b4d3e62aada27ef85c9a9bd
treef9a04e208c4138589c3e3d7c33d4030ca9357de8
parent2682f8c0dc99962417ebbb91896212536d871570
parentc5e594b66e8bb23ffd271e982e557800b381f9d8
Merge branch 'master' of git.gromacs.org:gromacs
include/Makefile.am
src/gmxlib/Makefile.am