Guido Cossu 7b03d8d087 Fixing the remaining merge conflicts

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

..

fermion

Merge branch 'develop' into feature/hmc_generalise

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

gauge

Merge branch 'develop' into feature/hmc_generalise

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

pseudofermion

Merge branch 'develop' into feature/hmc_generalise

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

scalar

Fixing the remaining merge conflicts

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

Action.h

Merge branch 'develop' into feature/bgq-asm

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

ActionBase.h

Refactoring header layout

2017-02-22 18:09:33 +00:00

ActionCore.h

Merge branch 'develop' into feature/hmc_generalise

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

ActionParams.h

Merge branch 'develop' into feature/hmc_generalise

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

ActionSet.h

Cleaning up files and directories

2017-01-26 15:24:49 +00:00