Merge branch 'master' into GetRidOfCUDA

Browse Source

Conflicts:
	docs/BUILD.md

pull/37/head

Jens Steube 9 years ago

parent 700ed7dba7 1146c43986

commit 6893a9ad85

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

Show Stats Download Patch File Download Diff File

Diff Content Not Available