Commit 10bc1da9 authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'v2.0' into v2.0-gpu-balance 

Also moved
gromacs-4.6.3.diff/src/mdlib/force.c*
to
gromacs-4.6.5.diff/src/mdlib/force.c*
parents cb45a9c0 6261e032
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