merged with latest upstream trunk

This commit is contained in:
csoler 2015-12-05 16:49:00 -05:00
commit 0c1e6301b3
295 changed files with 17456 additions and 12859 deletions

View file

@ -195,7 +195,9 @@ void RetroShareLink::fromUrl(const QUrl& url)
if (url.scheme() != RSLINK_SCHEME) {
/* No RetroShare-Link */
#ifdef DEBUG_RSLINK
std::cerr << "Not a RS link: scheme=" << url.scheme().toStdString() << std::endl;
#endif
return;
}