mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-08-16 10:01:14 -04:00
Merge branch 'master' into tunnel-names
This commit is contained in:
commit
c47e6f620d
1552 changed files with 110144 additions and 105662 deletions
|
@ -295,6 +295,8 @@ class p3turtle: public p3Service, public RsTurtle, public p3Config
|
|||
///
|
||||
virtual int tick();
|
||||
|
||||
virtual void getItemNames(std::map<uint8_t,std::string>& names) const;
|
||||
|
||||
/************* from p3Config *******************/
|
||||
virtual RsSerialiser *setupSerialiser() ;
|
||||
virtual bool saveList(bool& cleanup, std::list<RsItem*>&) ;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue