For different projects with created the spie<> and qc branches.
Let's leave these alone for now. They will serve as a record, and maybe someday we will just zip them up and keep them as an archive. Some of them are saved as releases.
We also have branches for
master
clean - This is the real development branch that merges the illumination and other features.
illum (Francois related)
HJ (GPU implementation) - This one should get clean merged into it from time to time.
japan (only a couple of scripts QT made for SL) - This should get merged into clean
old-state - This could be deleted, we don't know who made it or why (maybe QT).
For work, the developers should be using only master and clean.
For different projects with created the spie<> and qc branches. Let's leave these alone for now. They will serve as a record, and maybe someday we will just zip them up and keep them as an archive. Some of them are saved as releases.
We also have branches for
master clean - This is the real development branch that merges the illumination and other features. illum (Francois related) HJ (GPU implementation) - This one should get clean merged into it from time to time. japan (only a couple of scripts QT made for SL) - This should get merged into clean old-state - This could be deleted, we don't know who made it or why (maybe QT).
For work, the developers should be using only master and clean.