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

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

Browse Source 
Conflicts:
	src/gui/update_settings.cpp


Origin commit data
------------------
Commit: aeebd0d444
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)
This commit is contained in:
vanhofen
2017-09-14 16:30:58 +02:00
parent 7e7da2d53b fb0a25d759
commit d0dc31ae8d
22 changed files with 50104 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/file.h
View File

@@ -52,8 +52,6 @@
class CFile
{
private:
mutable int Type;
public:
enum FileType
{