Merge remote-tracking branch 'upstream/master' into why_are_the_christmas_lights_still_up

This commit is contained in:
glassmancody.info 2021-03-27 12:28:33 -07:00
commit 7370acdf54
88 changed files with 1222 additions and 293 deletions

View file

@ -34,7 +34,7 @@ namespace CSMPrefs
void storeValue(const QKeySequence& sequence);
void resetState();
static const int MaxKeys = 4;
static constexpr int MaxKeys = 4;
QPushButton* mButton;