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

Merge branch 'check/dvbsi++' commit 984435d48e

Browse Source 
Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/components/cc.h
	src/gui/components/components.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/neutrino.cpp
	src/zapit/src/bouquets.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 0cf191822a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-21 (Thu, 21 Feb 2013)
This commit is contained in:
Stefan Seyfried
2013-02-21 17:07:18 +01:00
parent fb54adb26a 984435d48e
commit 2b4f5306dc
42 changed files with 871 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/components/Makefile.am
View File

@@ -1,4 +1,4 @@
AM_CPPFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS
AM_CPPFLAGS = -fno-rtti -fno-exceptions
INCLUDES = \
-I$(top_builddir) \
@@ -6,8 +6,9 @@ INCLUDES = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/zapit/include \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/libnet \
-I$(top_srcdir)/lib/libeventserver \
-I$(top_srcdir)/lib/libconfigfile \
-I$(top_srcdir)/lib/xmltree \
@FREETYPE_CFLAGS@
if BOXTYPE_COOL

8
src/gui/components/cc.h
View File

@@ -1,9 +1,9 @@
/*
GUI window component classes - Neutrino-GUI
Based up Neutrino-GUI - Tuxbox-Project
Copyright (C) 2001 by Steffen Hehn 'McClean'
Copyright(C) 2012, 2013, Thilo Graf
This class contains generic components for GUI-related parts.
Classes for generic for GUI-related components.
Copyright (C) 2012, 2013, Thilo Graf 'dbt'
License: GPL

10
src/gui/components/components.cpp
View File

@@ -1,10 +1,10 @@
/*
GUI window component classes - Neutrino-GUI
Based up Neutrino-GUI - Tuxbox-Project
Copyright (C) 2001 by Steffen Hehn 'McClean'
Copyright(C) 2012, 2013, Thilo Graf
Copyright(C) 2012, Michael Liebmann
This class contains generic components for GUI-related parts.
Classes for generic for GUI-related components.
Copyright (C) 2012, 2013, Thilo Graf 'dbt'
Copyright (C) 2012, Michael Liebmann 'micha-bbg'
License: GPL