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

Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: b5dd90e3c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-25 (Sat, 25 Feb 2017)
This commit is contained in:
vanhofen
2017-02-25 00:17:33 +01:00
6 changed files with 24 additions and 12 deletions

View File

@@ -165,9 +165,6 @@ void CComponentsScrollBar::initSegments()
y_seg += h_seg + append_y_offset;
int id = sb_segments_obj->getCCItemId(item);
if (sb_mark_id > id){
dprintf(DEBUG_NORMAL, "[CComponentsScrollBar] %s: sb_mark_id out of range current=%d allowed=%d\n", __func__, sb_mark_id, id);
}
//set color for marked id
if (sb_mark_id == id){