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

@ -41,8 +41,8 @@
#include "ClientTunnelPane.h"
#include "TunnelConfig.h"
#include "../../Config.h"
#include "../../FS.h"
#include "Config.h"
#include "FS.h"
#include <QDebug>