Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
Loading
Showing with 62 additions and 32 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment