6773ca0dfd
eb80c07f57
Resolved conflicts: kept HEAD versions of QSS (has later refinements), InitGui.py (has newer origin architecture), and silo submodule.
Cherry-picked 316d4f4b52 with conflict resolution: - CMakeLists.txt: merged Kindred version vars with upstream 1.2.0-dev base - src/Main/*.cpp: applied Kindred branding (banner, copyright, license) - Resolved add/add conflicts for files already copied in Phase 1 - Includes assembly joint flip overconstrain fix
316d4f4b52