Lanny91 c11d69787e Merge branch 'feature/hadrons' of https://github.com/paboyle/Grid into feature/rare_kaon ... # Conflicts: # extras/Hadrons/Modules.hpp # extras/Hadrons/Modules/MFermion/GaugeProp.hpp # extras/Hadrons/modules.inc # tests/hadrons/Test_hadrons.hpp # tests/hadrons/Test_hadrons_meson_3pt.cc		2017-06-22 16:26:31 +02:00
..
action	Merge branch 'feature/hadrons' of https://github.com/paboyle/Grid into feature/rare_kaon	2017-06-22 16:26:31 +02:00
hmc	Merge commit 'a7d56523abee6c9030fdd9303c79954897b1086f' into feature/hadrons	2017-06-21 18:32:48 +01:00
modules	Added topological charge measurement	2017-03-17 16:14:57 +09:00
observables	Moving the topological charge outside the HMC related routines	2017-05-02 14:40:12 +01:00
representations	Exposing support for Ncolours and Ndimensions and JSON input file for the ScalarAction	2017-05-05 17:36:43 +01:00
smearing	Wilson flow with adaptive steps	2017-06-02 16:55:53 +01:00
spin	spurious .dirstamp files removed	2017-04-10 17:00:22 +01:00
utils	Merge branch 'develop' of https://github.com/paboyle/Grid into develop	2017-06-19 14:01:44 +01:00
LatticeTheories.h	Working on the 5d	2016-10-21 14:22:25 +01:00
QCD.h	Merge branch 'feature/hadrons' of https://github.com/paboyle/Grid into feature/rare_kaon	2017-05-26 16:00:50 +01:00