Commit 6f20a378 authored by Piero Gasparotto's avatar Piero Gasparotto
Browse files

Merge remote-tracking branch 'upstream/von-misses' into pamm 

Conflicts:
	src/multicolvar/MultiColvarFunction.h
	src/tools/KernelFunctions.cpp
	src/tools/LinkCells.h
	src/vesselbase/ValueVessel.h
parents 76fa841b 3445663e
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