mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 16:31:05 +02:00
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
src/gui/hdd_menu.cpp
src/gui/hdd_menu.h
Origin commit data
------------------
Commit: 73418490bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
This commit is contained in:
@@ -450,7 +450,7 @@ bool CFlashUpdate::checkVersion4Update()
|
||||
#endif
|
||||
}
|
||||
|
||||
string filters[] = {"bin", "txt", "opk", "ipk"};
|
||||
std::string filters[] = {"bin", "txt", "opk", "ipk"};
|
||||
for(size_t i=0; i<sizeof(filters)/sizeof(filters[0]) ;i++)
|
||||
UpdatesFilter.addFilter(filters[i]);
|
||||
|
||||
|
Reference in New Issue
Block a user