Merge branch 'master' into NLO_matching
Conflicts:
include/RHEJ/EventReweighter.hh
include/RHEJ/MatrixElement.hh
include/RHEJ/config.hh
src/EventReweighter.cc
src/MatrixElement.cc
Merge branch 'master' into NLO_matching 6d9109e1d308Unpublished Unpublished Commit · Learn MoreNot On Permanent Ref: This commit is not an ancestor of any permanent ref.
Description Merge branch 'master' into NLO_matching Conflicts:
Details
Event Timeline
Merged Changes
|