Merge remote-tracking branch 'remotes/origin/master' into 111-remodel…

…-gui-work-and-split-between-threads
vpinball · Sep 4, 2024 · 38928d9 · 38928d9
2 parents 66a2faf + dbd43f2
commit 38928d9
Show file tree

Hide file tree

Showing 13 changed files with 0 additions and 962 deletions.
diff --git a/b2sbackglassserver/b2sbackglassserver/DirectOutputPlugin/B2SServerDirectOutputPlugin.dll b/b2sbackglassserver/b2sbackglassserver/DirectOutputPlugin/B2SServerDirectOutputPlugin.dll
diff --git a/b2sbackglassserver/b2sbackglassserver/DirectOutputPlugin/CSScriptLibrary.dll b/b2sbackglassserver/b2sbackglassserver/DirectOutputPlugin/CSScriptLibrary.dll
diff --git a/b2sbackglassserver/b2sbackglassserver/DirectOutputPlugin/Config/Cabinet.xml b/b2sbackglassserver/b2sbackglassserver/DirectOutputPlugin/Config/Cabinet.xml
diff --git a/...ckglassserver/b2sbackglassserver/DirectOutputPlugin/Config/DirectOutputTesterSettings.xml b/...ckglassserver/b2sbackglassserver/DirectOutputPlugin/Config/DirectOutputTesterSettings.xml
diff --git a/b2sbackglassserver/b2sbackglassserver/DirectOutputPlugin/Config/GlobalConfig.xml b/b2sbackglassserver/b2sbackglassserver/DirectOutputPlugin/Config/GlobalConfig.xml
diff --git a/b2sbackglassserver/b2sbackglassserver/DirectOutputPlugin/Config/TimedDimmerLampEffect.cs b/b2sbackglassserver/b2sbackglassserver/DirectOutputPlugin/Config/TimedDimmerLampEffect.cs