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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 470a8b62dd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-23 (Wed, 23 Aug 2017)
This commit is contained in:
vanhofen
2017-08-23 15:24:38 +02:00
parent 1e4ded8ce9 142d17c8b0
commit 5628badb78
15 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libtuxtxt/tuxtxt_common.h
View File

@@ -704,8 +704,9 @@ void *tuxtxt_CacheThread(void * /*arg*/)
tuxtxt_cache.current_subpage[magazine] = -1;
continue;
}
#if 0 /* ? */
b1 &= 3;
#endif
b3 &= 7;
if (tuxtxt_is_dec(tuxtxt_cache.page_receiving)) /* ignore other subpage bits for hex pages */