Merge "Merge branch release-4-6"
authorErik Lindahl <erik@kth.se>
Fri, 15 Nov 2013 20:51:19 +0000 (21:51 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Fri, 15 Nov 2013 20:51:19 +0000 (21:51 +0100)
commit4dcabc49c31769338d9d9ee5bc214a1c6a5f10c6
tree1d3c599e69672a3bc6abe5042f904755f8283d48
parent5b7b8b7b8c7bbc021b831cf1e98f2902e33d568f
parentb67e4ac94431bc0793468280ee8d10305e03942d
Merge "Merge branch release-4-6"
CMakeLists.txt
src/config.h.cmakein