paboyle 4908b77d46 Fixed conflicts. PLEASE avoid making wholesale cosmetic only changes, this created ... a HUGE amount of difficult to resolve and understand conflicts . Wholesale formatting, reordering functions etc... in a central file like Tensor_class or Grid_vector_types while others are also editing without making substantial functionality changes creates pain.		2016-07-15 20:59:07 +01:00
..
action	Merge branch 'develop' of https://github.com/paboyle/Grid into develop	2016-07-15 19:26:06 +01:00
hmc	Cleaned up HMC output. Tested smeared HMCs for single precision (OK)	2016-07-05 12:03:54 +01:00
smearing	Fixed conflicts. PLEASE avoid making wholesale cosmetic only changes, this created	2016-07-15 20:59:07 +01:00
spin	Changed the colouring classes	2016-06-30 16:51:03 +01:00
utils	Merge branch 'develop' of https://github.com/paboyle/Grid into develop	2016-07-15 19:26:06 +01:00
QCD.h	Fixed conflicts. PLEASE avoid making wholesale cosmetic only changes, this created	2016-07-15 20:59:07 +01:00