Guido Cossu 7b03d8d087 Fixing the remaining merge conflicts

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

..

core

Merge branch 'develop' into feature/hmc_generalise

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

debug

Merge branch 'develop' into feature/bgq-asm

2017-03-28 04:49:30 -04:00

forces

Merge branch 'develop' into feature/hmc_generalise

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

hadrons

typo

2017-01-30 10:53:13 -08:00

hmc

Merge branch 'feature/hmc_generalise' into feature/scalar_adjointFT

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

IO

Merge branch 'develop' into feature/hmc_generalise

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

qdpxx

Debugged staggered conventions

2017-03-31 14:41:48 +09:00

smearing

Adding tests for WilsonFlow classes

2017-03-21 16:11:35 +09:00

solver

Merge branch 'develop' into feature/hmc_generalise

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

testu01

Clean up

2017-04-02 23:13:48 +09:00

Makefile.am

Adding tests for WilsonFlow classes

2017-03-21 16:11:35 +09:00

Test_cayley_even_odd_vec.cc

Merge branch 'feature/staggering' into develop

2017-03-28 15:25:55 +09:00

Test_cshift.cc

No random device

2017-04-02 00:29:40 +09:00

Test_dwf_mixedcg_prec.cc

New automatic implementation of gamma matrices, Meson and SeqGamma are broken

2017-01-23 19:13:43 -08:00

Test_simd.cc

No random device

2017-04-02 00:29:40 +09:00

Test_stencil.cc

Fixing the remaining merge conflicts

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