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

author David van der Spoel <spoel@xray.bmc.uu.se>

Sun, 16 May 2010 19:52:20 +0000 (21:52 +0200)

committer David van der Spoel <spoel@xray.bmc.uu.se>

Sun, 16 May 2010 19:52:20 +0000 (21:52 +0200)
author David van der Spoel <spoel@xray.bmc.uu.se>
Sun, 16 May 2010 19:52:20 +0000 (21:52 +0200)
committer David van der Spoel <spoel@xray.bmc.uu.se>
Sun, 16 May 2010 19:52:20 +0000 (21:52 +0200)
diff --cc include/Makefile.am
Simple merge
diff --cc src/gmxlib/Makefile.am
Simple merge
author	David van der Spoel <spoel@xray.bmc.uu.se>
	Sun, 16 May 2010 19:52:20 +0000 (21:52 +0200)
committer	David van der Spoel <spoel@xray.bmc.uu.se>
	Sun, 16 May 2010 19:52:20 +0000 (21:52 +0200)
		1	2
include/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/gmxlib/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history