Merge branch 'master' into NLO_matching
Conflicts:
include/RHEJ/ScaleFunction.hh
src/ScaleFunction.cc
src/YAMLreader.cc
src/main.cc
Unpublished Commit ยท Learn More
Not On Permanent Ref: This commit is not an ancestor of any permanent ref.
Description
Description
Details
Details
- Provenance
hej Authored on Jun 12 2018, 11:23 AM andersen Pushed on Feb 21 2019, 1:38 PM - Parents
- rHEJadf73af058f4: Merge branch 'master' into NLO_matching
rHEJe3f51942ba8b: updated yaml and clhep version in CMake - Branches
- Unknown
- Tags
- Unknown
Event Timeline
Merged Changes
Merged Changes
- 6cee0bf25f50 added mixmax generatorAuthor
- 5f2925e1109b factored out progress bar creationAuthor
- 4e9115ab9c51 added progress barAuthor
- 1f5250d41fba made ProgressBar movableAuthor
- 35268e22e4fd document custom scale importsAuthor
- 73d02ae319de removed empty namespaceAuthor
- 53fd5777de7c removed dead codeAuthor