Merge branch 'develop' into feature/feynman-rules

Browse Source

# Conflicts:
#	lib/Threads.h
#	lib/qcd/action/fermion/WilsonFermion.cc
#	lib/qcd/action/fermion/WilsonFermion.h
#	lib/qcd/utils/SUn.h
#	lib/simd/Grid_avx.h
#	lib/simd/Intel512common.h

...

This commit is contained in:

Antonin Portelli

2016-10-19 18:35:18 +01:00

parent a123dcd7e9 7af9b87318

commit 997fd882ff

84 changed files with 6162 additions and 2851 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

862

lib/qcd/utils/SUn.h

File diff suppressed because it is too large Load Diff