HomeHEPForge
Diffusion HEJ 055aa6e78a9a

Merge branch 'master' into NLO_matching
055aa6e78a9aUnpublished

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:
include/RHEJ/ScaleFunction.hh
include/RHEJ/config.hh
src/EventReweighter.cc
src/ScaleFunction.cc
src/YAMLreader.cc

Details

Provenance
hejAuthored on May 24 2018, 6:16 PM
andersenPushed on Feb 21 2019, 1:38 PM
Parents
rHEJfc71cbbb74b8: Fixed compiler warning
rHEJa92cb3752514: Fixed compiler warning
Branches
Unknown
Tags
Unknown