Antonin Portelli 7587df831a Merge branch 'develop' into feature/hadrons ... # Conflicts: # lib/qcd/action/scalar/ScalarImpl.h		2017-06-20 15:50:39 +01:00
..
action	Merge branch 'develop' into feature/hadrons	2017-06-20 15:50:39 +01:00
hmc	Merge branch 'develop' into feature/hadrons	2017-06-20 15:50:39 +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 'develop' into feature/hmc_generalise	2017-04-05 14:41:04 +01:00