Antonin Portelli 7587df831a Merge branch 'develop' into feature/hadrons ...

# Conflicts:
#	lib/qcd/action/scalar/ScalarImpl.h

2017-06-20 15:50:39 +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/qed-fvol' into feature/hadrons (non-trivial conflicts on scalar Impl)

2017-06-05 16:37:47 -05:00

PlaqPlusRectangleAction.h

Adding fermions actions support in the factories

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

WilsonGaugeAction.h

Faster derivative for WilsonGauge

2017-05-26 14:31:49 +01:00