merged with upstream

This commit is contained in:
hypnosis-i2p 2017-06-02 23:43:33 +08:00
parent 298181999d
commit 7379b4ddd2
9 changed files with 167 additions and 50 deletions

View file

@ -1,5 +1,5 @@
#include "ServerTunnelPane.h"
#include "../../ClientContext.h"
#include "ClientContext.h"
#include "SignatureTypeComboboxFactory.h"
ServerTunnelPane::ServerTunnelPane(TunnelsPageUpdateListener* tunnelsPageUpdateListener, ServerTunnelConfig* tunconf):