ScintillatorSynth / Scintillator

A Video Synthesis Engine for SuperCollider
https://scintillatorsynth.org
56 stars 8 forks source link

Merge master -> develop #174

Closed nhthn closed 3 years ago

nhthn commented 4 years ago

Purpose and motivation

I ran into a confusing branching situation when accidentally basing a PR off master instead of develop, since there is a release commit in master that isn't in develop (it looks like a squash-merge of all the 0.0.8 changes?). This PR merges master back into develop to prevent this from happening in the future.

Status