Merge "Merge branch release-4-6 into master"
authorTeemu Murtola <teemu.murtola@gmail.com>
Sun, 1 Sep 2013 09:39:18 +0000 (11:39 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Sun, 1 Sep 2013 09:39:18 +0000 (11:39 +0200)
commit5a62999d39f7a3822b1cbb1cbaead06d832f6e91
treef017325782a3da2193a2d59a0084d646145db49e
parentc5a5c5dd019bd6398e9151471ea5c44afe964840
parentb0f263e3a7381f3f5011823399da2d740ae3218f
Merge "Merge branch release-4-6 into master"
CMakeLists.txt
admin/installguide/installguide.tex