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

Origin commit data
------------------
Branch: ni/coolstream
Commit: 2733e0f260
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-02 (Mon, 02 Jan 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-01-02 23:55:23 +01:00
63 changed files with 172 additions and 109 deletions

View File

@@ -2008,7 +2008,6 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
if (frameBuffer->paintIcon(record_icon, icon_x_right - icon_w, ypos, fheight))
{
offset_right += icon_w + OFFSET_INNER_MID;
icon_x_right -= icon_w + OFFSET_INNER_MID;
}
}