HomeHEPForge
Diffusion HEJ cd33ad43b818

Merge branch 'master' into NLO_matching
cd33ad43b818Unpublished

Unpublished Commit ยท Learn More

Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

Merge branch 'master' into NLO_matching

Conflicts:
src/EventReweighter.cc
src/MatrixElement.cc
src/ScaleFunction.cc

Details

Provenance
hejAuthored on Oct 11 2018, 1:36 PM
andersenPushed on Feb 21 2019, 1:38 PM
Parents
rHEJ95923ac29493: Merge branch 'master' into NLO_matching
rHEJ77038ba3a785: Merge branch 'master' into qQH_fixed
Branches
Unknown
Tags
Unknown

Merged Changes