Diffusion herwighg 2a3f680aa9d2

merged from release branch
2a3f680aa9d2
Actions

Description

merged from release branch

Details

Provenance

dgrell

Authored on

Parents

rHERWIGHGa56d5e987302: merged
rHERWIGHG8a9317b08cc3: merged version printing

Branches

Unknown

Tags

Unknown

Event Timeline

dgrell committed rHERWIGHG2a3f680aa9d2: merged from release branch.Jan 21 2016, 2:02 PM

Merged Changes

8a9317b08cc3 merged version printing
Author
dgrell
Browse Repository
No Builds
No Audits
5f5dff21ea3c merged from 7.0.0
Author
dgrell
Browse Repository
No Builds
No Audits
4f592ea67001 update to .hgignore
Author
richardn
Browse Repository
No Builds
No Audits
863f84df0172 intermediate merge from release-7
Author
dgrell
Browse Repository
No Builds
No Audits
e05bf4088d2b Contrib/FxFx Makefile.in fix
Author
andreasp
Browse Repository
No Builds
No Audits
1e37e0782169 undo path changes on trunk which is still installing to Herwig++
Author
Simon Plätzer <simon.plaetzer@gmail.com>
Browse Repository
No Builds
No Audits

Changes (25)

Path

Size

.hgsub

.hgsubstate

Contrib/

Makefile.am

DipoleShower/

Base/

DipoleEventReweight.h

DipoleShowerHandler.cc

DipoleShowerHandler.h

Models/

StandardModel/

O2AlphaS.cc

Shower/

Base/

Utilities/

MCatNLO-Dipole-HardAlphaSTune.in

MCatNLO-Dipole-ShowerAlphaSTune.in

Makefile.am

OnShellEWProduction.in

	OnShellHProduction.in
	OnShellEWProduction.in

	OnShellWProduction.in
	OnShellEWProduction.in

	OnShellZProduction.in
	OnShellEWProduction.in

rHERWIGHG2a3f680aa9d2

View Options

.hgsub

View Options

.hgsubstate

View Options

Contrib/Makefile.am

View Options

DipoleShower/Base/DipoleEventReweight.h

View Options

DipoleShower/DipoleShowerHandler.cc

View Options

DipoleShower/DipoleShowerHandler.h

View Options

Models/StandardModel/O2AlphaS.cc

View Options

Shower/Base/Evolver.cc

View Options

Shower/Base/Evolver.h

View Options

Shower/Base/ShowerProgenitor.h

View Options

Utilities/HerwigStrategy.cc

View Options

Utilities/HerwigStrategy.h

View Options

src/DIS-Matchbox.in

View Options

src/HerwigCLI.cc

View Options

src/LEP-Matchbox.in

View Options

src/LHC-Matchbox.in

View Options

src/Matchbox/MCatNLO-Dipole-HardAlphaSTune.in

View Options

src/Matchbox/MCatNLO-Dipole-ShowerAlphaSTune.in

View Options

src/Matchbox/Makefile.am

View Options

src/Matchbox/OnShellEWProduction.in

View Options

src/Matchbox/OnShellHProduction.in

View Options

src/Matchbox/OnShellWProduction.in

View Options

src/Matchbox/OnShellZProduction.in

merged from release branch2a3f680aa9d2Actions

Description

Details

Event Timeline

Merged Changes

Changes (25)

rHERWIGHG2a3f680aa9d2

.hgsub

.hgsubstate

Contrib/Makefile.am

DipoleShower/Base/DipoleEventReweight.h

DipoleShower/DipoleShowerHandler.cc

DipoleShower/DipoleShowerHandler.h

Models/StandardModel/O2AlphaS.cc

Shower/Base/Evolver.cc

Shower/Base/Evolver.h

Shower/Base/ShowerProgenitor.h

Utilities/HerwigStrategy.cc

Utilities/HerwigStrategy.h

src/DIS-Matchbox.in

src/HerwigCLI.cc

src/LEP-Matchbox.in

src/LHC-Matchbox.in

src/Matchbox/MCatNLO-Dipole-HardAlphaSTune.in

src/Matchbox/MCatNLO-Dipole-ShowerAlphaSTune.in

src/Matchbox/Makefile.am

src/Matchbox/OnShellEWProduction.in

src/Matchbox/OnShellHProduction.in

src/Matchbox/OnShellWProduction.in

src/Matchbox/OnShellZProduction.in

merged from release branch
2a3f680aa9d2
Actions