Merge branch 'master' into pu/mp

Origin commit data
------------------
Commit: e3998c1ced
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-15 (Fri, 15 Sep 2017)
This commit is contained in:
Jacek Jendrzej
2017-09-15 20:44:49 +02:00
23 changed files with 274 additions and 348 deletions

View File

@@ -59,8 +59,8 @@ CComponentsSlider::CComponentsSlider( const int& x_pos, const int& y_pos, const
csl_body_obj = NULL;
csl_slider_obj = NULL;
csl_body_icon = NEUTRINO_ICON_VOLUMEBODY;
csl_slider_icon =NEUTRINO_ICON_VOLUMESLIDER2;
csl_body_icon = NEUTRINO_ICON_SLIDER_BODY;
csl_slider_icon =NEUTRINO_ICON_SLIDER_INACTIVE;
initCCSlItems();
initParent(parent);