Stefan Seyfried 32de6beef0 Merge remote-tracking branch 'check/next-cc' ...

needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h

2013-09-01 19:46:10 +02:00

..

buttons.cpp

Merge remote-tracking branch 'check/next-cc'

2013-09-01 19:46:10 +02:00

buttons.h

Replace color indexes of the text colors by real color values for RenderString()

2013-07-21 22:00:58 +02:00

colorchooser.cpp

Merge remote-tracking branch 'check/next-cc'

2013-09-01 19:46:10 +02:00

colorchooser.h

gui/widget/colorchooser.cpp: add getColor() member

2013-07-18 14:51:59 +04:00

drawable.cpp

Replace color indexes of the text colors by real color values for RenderString()

2013-07-21 22:00:58 +02:00

drawable.h

…

helpbox.cpp

…

helpbox.h

…

hintbox.cpp

Merge remote-tracking branch 'check/next-cc'

2013-09-01 19:46:10 +02:00

hintbox.h

…

hintboxext.cpp

Merge remote-tracking branch 'check/next-cc'

2013-09-01 19:46:10 +02:00

hintboxext.h

…

icons.h

Merge branch 'next' into next-cc

2013-06-02 10:46:42 +04:00

keychooser.cpp

Merge remote-tracking branch 'check/next-cc'

2013-09-01 19:46:10 +02:00

keychooser.h

…

listbox.cpp

Merge remote-tracking branch 'check/next-cc'

2013-09-01 19:46:10 +02:00

listbox.h

…

listframe.cpp

Replace color indexes of the text colors by real color values for RenderString()

2013-07-21 22:00:58 +02:00

listframe.h

…

Makefile.am

Merge remote-tracking branch 'check/next-cc'

2013-09-01 19:46:10 +02:00

menue.cpp

Merge remote-tracking branch 'check/next-cc'

2013-09-01 19:46:10 +02:00

menue.h

colorchooser: display selected color in menue, based on patch (c) martii <m4rtii@gmx.de>

2013-07-18 14:51:59 +04:00

messagebox.cpp

Merge remote-tracking branch 'check/next-cc'

2013-09-01 19:46:10 +02:00

messagebox.h

Merge remote-tracking branch 'check/next-cc'

2013-05-10 10:06:47 +02:00

mountchooser.cpp

…

mountchooser.h

…

msgbox.cpp

Merge remote-tracking branch 'check/next-cc'

2013-09-01 19:46:10 +02:00

msgbox.h

…

progressstatus.h

gui/widget/progressstatus.h: try to fix compile with gcc 4.6.3/uclibc:

2013-06-11 11:35:07 +04:00

progresswindow.cpp

Merge remote-tracking branch 'check/next-cc'

2013-09-01 19:46:10 +02:00

progresswindow.h

* Software update: Rework preparing the flash process

2013-06-08 16:20:32 +02:00

signalbars.cpp

CSignalBar/CSignalBox: rework position and paint handling, use dyn fonts

2013-08-30 22:17:08 +02:00

signalbars.h

CSignalBar/CSignalBox: rework position and paint handling, use dyn fonts

2013-08-30 22:17:08 +02:00

stringinput_ext.cpp

Merge remote-tracking branch 'check/next-cc'

2013-09-01 19:46:10 +02:00

stringinput_ext.h

- stringinput: rework dialogs

2013-03-09 15:06:10 +01:00

stringinput.cpp

Merge remote-tracking branch 'check/next-cc'

2013-09-01 19:46:10 +02:00

stringinput.h

- stringinput: avoid an access out of bounds

2013-06-14 13:10:02 +02:00

textbox.cpp

Merge remote-tracking branch 'check/next-cc'

2013-09-01 19:46:10 +02:00

textbox.h

CComponentsText: try to use an inherited version of CBox class

2013-07-21 22:02:43 +02:00