mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 07:22:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8272eda529
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-08-19 17:58:43 +02:00
parent 5d86ff2594
commit a19fe6bed0
5 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/timerdclient/timerdclient.cpp
View File

@@ -34,7 +34,7 @@
#define VALGRIND_PARANOIA(x) {}
#endif
int CTimerdClient::adzap_eventID = 0;
//int CTimerdClient::adzap_eventID = 0;
unsigned char CTimerdClient::getVersion () const
{