Merge branch 'master' into tunnel-names

This commit is contained in:
Pooh 2017-09-25 21:43:41 +03:00 committed by GitHub
commit c47e6f620d
1552 changed files with 110144 additions and 105662 deletions

View file

@ -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*>&) ;