-
Conflicts: stim/biomodels/network.h stim/math/filters/conv2.h stim/visualization/cylinder.h stim/visualization/gl_network.h
-
…tor. remanded some variable for clarity fixed a couple of inconcistencies.
-
Merge Pranathi_stimlib into master See merge request !3