Michael Marshall 803329af99 Merge branch 'develop' into feature/distil ...

* develop:
  Fix after GPU merge: Phase in Free Propagator
  z2-momentum phase module

# Conflicts:
#	Hadrons/Modules/MSource/MomentumPhase.hpp

2019-10-07 13:09:52 +01:00

..

action

Merge branch 'develop' into feature/distil

2019-10-07 13:09:52 +01:00

hmc

Merge branch 'develop' into feature/gpu-port

2019-07-16 11:55:17 +01:00

modules

Merge branch 'develop' into feature/gpu-port

2018-12-13 05:11:34 +00:00

observables

Merge branch 'develop' into feature/gpu-port

2018-12-13 05:11:34 +00:00

representations

Merge branch 'develop' into feature/gpu-port

2018-12-13 05:11:34 +00:00

smearing

Merge GPU support (upstream/develop) into distillation branch.

2019-09-13 13:30:00 +01:00

spin

Merge branch 'develop' into feature/gpu-port

2019-07-16 11:55:17 +01:00

utils

BaryonUtils.h is now part of Baryons

2019-09-17 13:19:20 +01:00

LatticeTheories.h

Hadrons: moving Hadrons to root directory, build system improvements

2018-08-28 15:00:40 +01:00

QCD.h

Merge branch 'develop' into feature/gpu-port

2018-12-13 05:11:34 +00:00