Skip to content
Commit 00589446 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Merge branch 'matrices-gpu' 

Conflicts:
	install
	src/implementation/core/tnlCuda_impl.h
	tests/unit-tests/core/arrays/tnlMultiArrayTester.h
	tests/unit-tests/matrices/tnlCSRMatrixTester.h
parents 68a69066 f386df29
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment