Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 06:06:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge of branch v0.6-idclean 7180

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2014-03-17 20:56:06 +00:00
parent 7815efb16f
commit 0f29d28b1b
397 changed files with 6503 additions and 5702 deletions
Download patch file Download diff file Expand all files Collapse all files

3
retroshare-gui/src/rshare.h
View file

@ -36,6 +36,7 @@
#include <QKeySequence>
#include "util/log.h"
#include "retroshare/rstypes.h"
/** Rshare's version string */
#define RSHARE_VERSION "0.7"
@ -89,7 +90,7 @@ public:
/** Recalculates matching stylesheet for widget **/
static void refreshStyleSheet(QWidget *widget, bool processChildren);
static bool loadCertificate(const std::string &accountId, bool autoLogin);
static bool loadCertificate(const RsPeerId &accountId, bool autoLogin);
/**
* Update Language, Style and StyleSheet.