Merge branch 'release-4-5-patches' of git.gromacs.org:gromacs into release-4-5-patches

author Erik Lindahl <lindahl@cbr.su.se>

Wed, 11 Aug 2010 17:44:13 +0000 (19:44 +0200)

committer Erik Lindahl <lindahl@cbr.su.se>

Wed, 11 Aug 2010 17:44:13 +0000 (19:44 +0200)
author Erik Lindahl <lindahl@cbr.su.se>
Wed, 11 Aug 2010 17:44:13 +0000 (19:44 +0200)
committer Erik Lindahl <lindahl@cbr.su.se>
Wed, 11 Aug 2010 17:44:13 +0000 (19:44 +0200)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/gmxlib/CMakeLists.txt
Simple merge
author	Erik Lindahl <lindahl@cbr.su.se>
	Wed, 11 Aug 2010 17:44:13 +0000 (19:44 +0200)
committer	Erik Lindahl <lindahl@cbr.su.se>
	Wed, 11 Aug 2010 17:44:13 +0000 (19:44 +0200)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/gmxlib/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history