mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-08-17 18:40:49 -04:00
Merge branch 'master' into thewire_fix_message_display
This commit is contained in:
commit
3402aa861f
119 changed files with 1809 additions and 1100 deletions
|
@ -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
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue