Antonin Portelli 15f15a7cfd Merge branch 'develop' into feature/hadrons ... # Conflicts: # extras/Hadrons/Modules.hpp # extras/Hadrons/modules.inc		2018-01-22 20:03:36 +00:00
..
Hadrons	Merge branch 'develop' into feature/hadrons	2018-01-22 20:03:36 +00:00
qed-fvol	QED Gimpl moved in Photon.h	2016-12-29 22:43:38 +01:00
Makefile.am	Old qed-fvol program build disabled	2017-04-13 15:32:30 +01:00