Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Origin commit data
------------------
Branch: ni/coolstream
Commit: 86bedc2a3f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-03 15:52:12 +01:00
5 changed files with 33 additions and 11 deletions

View File

@@ -142,6 +142,8 @@ class CImageInfoNI : public CMenuTarget
void get_NET_Info(uint64_t *read_akt, long *read_packet, long *dummy, uint64_t *write_akt, long *write_packet);
void paint_NET_Info(int posx, int posy);
std::string getYWebVersion();
public:
CImageInfoNI();