Merge branch 'master' of git@git.gromacs.org:gromacs
commit9442d0a5c97a97f196b46e2bfbe8d3c4dbd161e9
authorSzilard Pall <pszilard@cbr.su.se>
Wed, 12 May 2010 15:21:15 +0000 (12 17:21 +0200)
committerSzilard Pall <pszilard@cbr.su.se>
Wed, 12 May 2010 15:21:15 +0000 (12 17:21 +0200)
treedf64b15a1afce6ad5e2ac88620188584a20c1618
parent6f261c135f0c934bfe7f012b7737f4883d33230d
parent04fd8d93b64cf9778daebab5d0d3344d4d778c39
Merge branch 'master' of git@git.gromacs.org:gromacs
src/kernel/md_openmm.c
src/kernel/openmm_wrapper.cpp