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
..
GaugeProp.hpp	Merge branch 'feature/hadrons' of https://github.com/paboyle/Grid into feature/rare_kaon	2017-06-22 16:26:31 +02:00