Merge branch 'master' of https://github.com/paboyle/Grid into scidac1_2

Browse Source

Conflicts:
	configure
	lib/qcd/action/Actions.h
	lib/qcd/action/fermion/WilsonKernels.h

...

This commit is contained in:

Jung committed 2016-01-06 03:44:57 -05:00

2 parents eb1759d7ea 34a0fde2ad

commit 5924e5a562

28 files changed

+8676 -41

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

No files matched your search

lib/algorithms/approx/.dirstamp

Whitespace-only changes.