Antonin Portelli 7587df831a Merge branch 'develop' into feature/hadrons ...

# Conflicts:
#	lib/qcd/action/scalar/ScalarImpl.h

2017-06-20 15:50:39 +01:00

..

MAction

Fixes after merge and point sink module

2017-06-06 11:45:30 -05:00

MContraction

Fixes after merge and point sink module

2017-06-06 11:45:30 -05:00

MFermion

Hadrons: Quark module renamed MFermion::GaugeProp

2017-06-07 20:10:48 -05:00

MGauge

Merge branch 'develop' into feature/hadrons

2017-06-20 15:50:39 +01:00

MLoop

Fixes after merge and point sink module

2017-06-06 11:45:30 -05:00

MScalar

Fixes after merge and point sink module

2017-06-06 11:45:30 -05:00

MSink

Fixes after merge and point sink module

2017-06-06 11:45:30 -05:00

MSolver

Fixes after merge and point sink module

2017-06-06 11:45:30 -05:00

MSource

Fixes after merge and point sink module

2017-06-06 11:45:30 -05:00

templates

Fixes after merge and point sink module

2017-06-06 11:45:30 -05:00