Merge "Merge branch release-4-6"

author Erik Lindahl <erik@kth.se>

Fri, 15 Nov 2013 20:51:19 +0000 (21:51 +0100)

committer Gerrit Code Review <gerrit@gerrit.gromacs.org>

Fri, 15 Nov 2013 20:51:19 +0000 (21:51 +0100)
author Erik Lindahl <erik@kth.se>
Fri, 15 Nov 2013 20:51:19 +0000 (21:51 +0100)
committer Gerrit Code Review <gerrit@gerrit.gromacs.org>
Fri, 15 Nov 2013 20:51:19 +0000 (21:51 +0100)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/config.h.cmakein
Simple merge
author	Erik Lindahl <erik@kth.se>
	Fri, 15 Nov 2013 20:51:19 +0000 (21:51 +0100)
committer	Gerrit Code Review <gerrit@gerrit.gromacs.org>
	Fri, 15 Nov 2013 20:51:19 +0000 (21:51 +0100)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/config.h.cmakein	patch \|	diff1 \|	diff2 \|	blob \| history