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

Merge branch 'matrices-gpu' of... 

Merge branch 'matrices-gpu' of ssh://geraldine.fjfi.cvut.cz:2222/local/projects/tnl/tnl into matrices-gpu

Conflicts:
	CMakeLists.txt
	src/CMakeLists.txt
parents 15a59c5f 5f49d192
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