Guido Cossu 7b03d8d087 Fixing the remaining merge conflicts

2017-04-05 16:17:46 +01:00

..

action

Fixing the remaining merge conflicts

2017-04-05 16:17:46 +01:00

hmc

Merge branch 'feature/hmc_generalise' into feature/scalar_adjointFT

2017-04-05 14:50:28 +01:00

modules

Added topological charge measurement

2017-03-17 16:14:57 +09:00

observables

Added topological charge measurement

2017-03-17 16:14:57 +09:00

representations

Merge branch 'feature/hmc_generalise' into feature/scalar_adjointFT

2017-04-05 14:50:28 +01:00

smearing

Small cosmetic changes and vscode gitignore

2017-03-23 14:09:35 +09:00

spin

Merge branch 'develop' into feature/bgq-asm

2017-02-23 00:25:29 +00:00

utils

Merge branch 'develop' into feature/hmc_generalise

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

LatticeTheories.h

Working on the 5d

2016-10-21 14:22:25 +01:00

QCD.h

Merge branch 'develop' into feature/hmc_generalise

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