mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-02 18:31:12 +02:00
Merge branch 'ni/cst-next' into ni/mp/cst-next
Conflicts:
acinclude.m4
src/gui/bedit/bouqueteditor_channels.cpp
src/gui/epgplus.cpp
src/gui/plugins.cpp
src/gui/widget/listbox.cpp
src/zapit/src/capmt.cpp
Origin commit data
------------------
Commit: 7135aac394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)
This commit is contained in:
@@ -52,7 +52,7 @@ CComponentsForm::CComponentsForm( const int x_pos, const int y_pos, const int w,
|
||||
cc_yr = y;
|
||||
|
||||
shadow = shadow_mode;
|
||||
shadow_w = SHADOW_OFFSET;
|
||||
shadow_w = OFFSET_SHADOW;
|
||||
corner_rad = RADIUS_LARGE;
|
||||
corner_type = CORNER_ALL;
|
||||
cc_item_index = 0;
|
||||
|
Reference in New Issue
Block a user