mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 02:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ac83da39a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-19 (Mon, 19 Sep 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-09-19 17:23:40 +02:00
committed by vanhofen
parent aa010fea13
commit f57ba957f4
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/system/helpers.h
View File

@@ -100,6 +100,7 @@ class CFileHelpers
CFileHelpers(); CFileHelpers();
~CFileHelpers(); ~CFileHelpers();
static CFileHelpers* getInstance(); static CFileHelpers* getInstance();
bool doCopyFlag;
void clearDebugInfo(); void clearDebugInfo();
void readDebugInfo(helpersDebugInfo* di); void readDebugInfo(helpersDebugInfo* di);