-
Conflicts: stim/biomodels/network.h stim/math/filters/conv2.h stim/visualization/cylinder.h stim/visualization/gl_network.h
-
…ed. Should make segmentation much easier, changes to the glObj class
-
…Cylinder now uses centerline
Conflicts: stim/biomodels/network.h stim/math/filters/conv2.h stim/visualization/cylinder.h stim/visualization/gl_network.h
…ed. Should make segmentation much easier, changes to the glObj class
…Cylinder now uses centerline