Merge branch 'master' into NLO_matching
Conflicts:
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 Jul 2 2018, 3:24 PM andersen Pushed on Feb 21 2019, 1:38 PM - Parents
- rHEJ1f55385c012b: Merge branch 'master' into NLO_matching
rHEJe5e2b944395e: Code cleanup - Branches
- Unknown
- Tags
- Unknown
Event Timeline
Merged Changes
Merged Changes
- e5e2b944395e Code cleanupAuthor
- d88430e310c2 minor corrections (mostly wording)Author
- 9531ea652a84 Added missing header guardsAuthor
- 5c23497da718 clarified wordingAuthor
- 8f9a764eb7ad removed obsolete headerAuthor
- a7af5c1c4236 removed obsolete fileAuthor
- af25ea1e4a5f Merge branch 'rivet-interface'Author
- 167d5b4c3514 Added test for rivet analysisAuthor
- ba366d39eeba moved rivet analysis to RHEJ codeAuthor
- 077016ee04fc Added working rivet analysis interfaceAuthor
- 461e83d2e178 added draft for developer manualAuthor
- a60a11649038 fixed link in documentationAuthor
- 8f2d61b2b2a3 Moved HepMC functions to classAuthor