Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
No related merge requests found
Showing
with 1498 additions and 1072 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment