Merge "Merge release-4-6 into master"
authorMark Abraham <mark.j.abraham@gmail.com>
Wed, 5 Mar 2014 06:23:00 +0000 (07:23 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Wed, 5 Mar 2014 06:23:00 +0000 (07:23 +0100)
1  2 
src/gromacs/gmxpreprocess/readir.c

Simple merge