Merge branch 'master' into thewire_fix_message_display

This commit is contained in:
drbob 2020-03-31 21:23:51 +11:00
commit 3402aa861f
119 changed files with 1809 additions and 1100 deletions

View file

@ -34,7 +34,7 @@
#include "util/TokenQueue.h"
#define IMAGE_WIRE ":/images/kgames.png"
#define IMAGE_WIRE ":/icons/wire.png"
class WireDialog : public MainPage, public TokenResponse, public PulseHolder, public WireGroupHolder
{