Merge branch 'master' of git@git.gromacs.org:gromacs

author Szilard Pall <pszilard@cbr.su.se>

Wed, 12 May 2010 15:21:15 +0000 (17:21 +0200)

committer Szilard Pall <pszilard@cbr.su.se>

Wed, 12 May 2010 15:21:15 +0000 (17:21 +0200)
author Szilard Pall <pszilard@cbr.su.se>
Wed, 12 May 2010 15:21:15 +0000 (17:21 +0200)
committer Szilard Pall <pszilard@cbr.su.se>
Wed, 12 May 2010 15:21:15 +0000 (17:21 +0200)
diff --cc src/kernel/md_openmm.c
Simple merge
diff --cc src/kernel/openmm_wrapper.cpp
Simple merge
author	Szilard Pall <pszilard@cbr.su.se>
	Wed, 12 May 2010 15:21:15 +0000 (17:21 +0200)
committer	Szilard Pall <pszilard@cbr.su.se>
	Wed, 12 May 2010 15:21:15 +0000 (17:21 +0200)
		1	2
src/kernel/md_openmm.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/kernel/openmm_wrapper.cpp	patch \|	diff1 \|	diff2 \|	blob \| history