Commit 1c9e2317 authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'v2.0' 

Small fix needed due to the fact that master branch
also calls cmd("setStopFlag") (for committor analysis)

Conflicts:
	patches/gromacs-4.6.5.diff/src/kernel/md.c
parents 3f75aa97 74b7cb36
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