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

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

Browse Source 
Conflicts:
	src/gui/hdd_menu.cpp
	src/gui/hdd_menu.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 73418490bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-10-02 23:21:37 +02:00
parent 6458ea748a 463700033b
commit 0a0c8a13bf
39 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/hdd_menu.h
View File

@@ -28,8 +28,6 @@
#include "widget/menue.h"
#include <gui/widget/hintbox.h>
using namespace std;
struct devtool_s {
std::string fmt;
std::string fsck;
@@ -65,7 +63,7 @@ class CHDDMenuHandler : public CMenuTarget
};
std::vector<hdd_s> hdd_list;
std::set<std::string> kernel_fs_list;
struct cmp_hdd_by_name: public binary_function <const struct hdd_s, const struct hdd_s, bool>
struct cmp_hdd_by_name: public std::binary_function <const struct hdd_s, const struct hdd_s, bool>
{
bool operator() (const struct hdd_s &c1, const struct hdd_s &c2)
{