James Harrison 294ee70a7a Merge branch 'feature/hadrons' into feature/qed-fvol ...

# Conflicts:
#	extras/Hadrons/modules.inc
#	lib/qcd/action/gauge/Photon.h

2018-05-21 18:02:41 +01:00

..

Gauge.h

Merge branch 'develop' into feature/hmc_generalise

2017-04-05 14:41:04 +01:00

GaugeImplementations.h

Merge branch 'develop' into feature/hmc_generalise

2017-04-05 14:41:04 +01:00

GaugeImplTypes.h

Merge branch 'feature/parallelio' into develop

2017-06-19 01:39:48 +01:00

Photon.h

Merge branch 'feature/hadrons' into feature/qed-fvol

2018-05-21 18:02:41 +01:00

PlaqPlusRectangleAction.h

Adding fermions actions support in the factories

2017-01-19 10:00:02 +00:00

WilsonGaugeAction.h

Guido broke the charge conjugate plaquette action with premature optimisation.

2018-03-05 12:55:41 +00:00