mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-07 21:58:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fb_generic.cpp
	src/gui/components/cc_frm_header.h
	src/gui/osd_setup.cpp
	src/gui/themes.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/settings.h


Origin commit data
------------------
Commit: 644a634f3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-08 (Tue, 08 Aug 2017)
This commit is contained in:
vanhofen
2017-08-08 15:54:12 +02:00
parent e21f270c04 22fdfc0484
commit a0f5a94440
21 changed files with 256 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/components/cc_frm_header.h
View File

@@ -32,7 +32,7 @@
#include "cc_frm_clock.h"
#include <driver/colorgradient.h>
#define DEFAULT_LOGO_ALIGN CCHeaderTypes::CC_LOGO_RIGHT //NI
#define DEFAULT_LOGO_ALIGN CCHeaderTypes::CC_LOGO_RIGHT
#define DEFAULT_TITLE_ALIGN CCHeaderTypes::CC_TITLE_LEFT
class CCHeaderTypes