Commit 2adc0beb authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge commit '6d826e8a' 

This will simplify merging between branches with changes in
the gromacs patch
parents 74f0cc44 6d826e8a
Expand all Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment