Merge branch 'cst-next' into nmp-cst-next

Conflicts: src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c657e2d892
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-29 (Fri, 29 Jan 2016)



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-01-29 15:41:18 +01:00
11 changed files with 42 additions and 26 deletions

View File

@@ -498,7 +498,6 @@ void CInfoViewerBB::paintFoot(int w)
foot->setColorBody(COL_INFOBAR_BUTTONS_BACKGROUND);
foot->enableColBodyGradient(g_settings.theme.infobar_gradient_bottom, COL_INFOBAR_PLUS_0, g_settings.theme.infobar_gradient_bottom_direction);
foot->setCorner(RADIUS_LARGE, CORNER_BOTTOM);
foot->enableGradientBgCleanUp();
foot->paint(CC_SAVE_SCREEN_NO);
}