Skip to content
Snippets Groups Projects
Commit 1c2190ad authored by Peter Thedens's avatar Peter Thedens
Browse files

Merge branch 'master' into TESTING_unit_testing_upgrade

parents c4bf5987 a6c0bffa
No related branches found
No related tags found
1 merge request!23Shift to Unity testing framework
......@@ -28,7 +28,7 @@
<link>
<name>ext/commands</name>
<type>2</type>
<location>/local/ucart/MicroCART_17-18/quad/src/commands</location>
<location>/local/ucart/MicroCART/quad/src/commands</location>
</link>
<link>
<name>ext/computation_graph</name>
......@@ -38,7 +38,7 @@
<link>
<name>ext/graph_blocks</name>
<type>2</type>
<location>/local/ucart/MicroCART_17-18/quad/src/graph_blocks</location>
<location>/local/ucart/MicroCART/quad/src/graph_blocks</location>
</link>
<link>
<name>ext/quad_app</name>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment