Commit Graph

232 Commits

Author SHA1 Message Date
Michael Liebmann
af2ffd931b Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: f89463dc08
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-16 (Sat, 16 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-16 07:22:31 +01:00
Stefan Seyfried
1364beedc3 port HWLIB_CFLAGS from neutrino-mp to neutrino-hd
Origin commit data
------------------
Branch: ni/coolstream
Commit: 79d800f955
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-12 (Tue, 12 Jan 2016)

Origin message was:
------------------
- port HWLIB_CFLAGS from neutrino-mp to neutrino-hd

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-14 22:29:00 +01:00
Stefan Seyfried
980ddb03e5 nhttpd: just push remote keys into rcinput directly
Origin commit data
------------------
Branch: ni/coolstream
Commit: ab3c2b9cf9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-09 (Sat, 09 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-09 20:16:12 +01:00
Stefan Seyfried
0a95a07654 Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: b837d8697b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-12-28 16:15:14 +01:00
Jacek Jendrzej
86cc4a8fb9 some gcc5 compil fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: ddb3c15d4b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-12-26 (Sat, 26 Dec 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-12-26 17:03:42 +01:00
Stefan Seyfried
247c16a717 fix build with newer openSUSE ffmpeg packages (again)
Origin commit data
------------------
Branch: ni/coolstream
Commit: d3245a4f90
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-12-13 18:16:16 +01:00
Stefan Seyfried
0acea28a5a add missing HWLIBS_CFLAGS, simplify Makefiles
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7928a0df4a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-12-13 17:48:15 +01:00
Stefan Seyfried
5f89c9a312 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)



------------------
This commit was generated by Migit
2015-12-13 17:41:55 +01:00
vanhofen
e97c3fd1f2 controlaip: add possibility to reload channellists
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2a63ddaeb9
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-10-21 (Wed, 21 Oct 2015)

Origin message was:
------------------
- controlaip: add possibility to reload channellists

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-10-21 19:38:35 +02:00
[CST] Focus
b06cb7a792 nhttpd/tuxboxapi/neutrinoapi.cpp: remove setServiceChanged calls after zap
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9a45735eba
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-01 (Mon, 01 Jun 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-06-02 12:26:26 +03:00
Jacek Jendrzej
93e7f3b575 controlapi.cpp: add getubouquetsxml
Origin commit data
------------------
Branch: ni/coolstream
Commit: 11eac1f091
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-05-10 (Sun, 10 May 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-05-10 18:01:26 +02:00
vanhofen
427915ab83 src/nhttpd/tuxboxapi: remove unused dbox code
Origin commit data
------------------
Branch: ni/coolstream
Commit: e59f8adccc
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-06 (Wed, 06 May 2015)

Origin message was:
------------------
- src/nhttpd/tuxboxapi: remove unused dbox code

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-05-06 22:59:04 +02:00
vanhofen
c095a9cbd5 move PLUGINDIR_VAR to global.h to avoid some hardcoded paths
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e6d7ad765
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-06 (Wed, 06 May 2015)

Origin message was:
------------------
- move PLUGINDIR_VAR to global.h to avoid some hardcoded paths

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-05-06 22:58:54 +02:00
vanhofen
51f2d5e54a controlapi: change logolist charset to UTF-8 to fix german umlauts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 907ea29f23
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-23 (Thu, 23 Apr 2015)

Origin message was:
------------------
- controlapi: change logolist charset to UTF-8 to fix german umlauts

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-04-23 23:01:45 +02:00
vanhofen
7a8ef7c613 controlapi: add logolist command to allow easy channellogo management
Origin commit data
------------------
Branch: ni/coolstream
Commit: c4c358720b
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-21 (Tue, 21 Apr 2015)

Origin message was:
------------------
- controlapi: add logolist command to allow easy channellogo management

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-04-21 14:31:00 +02:00
vanhofen
629cb028fc controlapi: allow search in EPG-titles only; fix typo
* Sytax:
 http://STBIP/control/epgsearch?SEARCHWORDS&epginfo=false
 or
 http://STBIP/control/epgsearchxml?SEARCHWORDS&epginfo=false


Origin commit data
------------------
Branch: ni/coolstream
Commit: ca34388616
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-13 (Mon, 13 Apr 2015)

Origin message was:
------------------
- controlapi: allow search in EPG-titles only; fix typo

* Sytax:
 http://STBIP/control/epgsearch?SEARCHWORDS&epginfo=false
 or
 http://STBIP/control/epgsearchxml?SEARCHWORDS&epginfo=false


------------------
This commit was generated by Migit
2015-04-13 12:34:12 +02:00
vanhofen
cc340bc53d neutrinoyparser.cpp: fix 364afbec33
Origin commit data
------------------
Branch: ni/coolstream
Commit: 389c6e6dc2
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-06 (Mon, 06 Apr 2015)

Origin message was:
------------------
- neutrinoyparser.cpp: fix 364afbec33

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-04-06 22:59:01 +02:00
vanhofen
479446afa6 yWeb: port "Tuxbox.DisplayLogos" from martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: dbc4d110fb
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-05 (Sun, 05 Apr 2015)

Origin message was:
------------------
- yWeb: port "Tuxbox.DisplayLogos" from martii

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-04-06 00:04:28 +02:00
vanhofen
1c1a493d97 neutrinoyparser.cpp: improve display of channels w/o logo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 90277c9982
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-05 (Sun, 05 Apr 2015)

Origin message was:
------------------
- neutrinoyparser.cpp: improve display of channels w/o logo

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-04-06 00:04:28 +02:00
Jacek Jendrzej
b567c33f35 nhttpd: fix switch tv<>radio in standby mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a97efe317
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-04-02 (Thu, 02 Apr 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-04-02 21:05:51 +02:00
Jacek Jendrzej
1dcbbf603d nhttpd: change sprintf to snprintf
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f2ac568c8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-03-31 (Tue, 31 Mar 2015)

Origin message was:
------------------
nhttpd: change sprintf to snprintf

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-03-31 14:44:41 +02:00
Stefan Seyfried
499659677f Merge remote-tracking branch 'test/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 92fcc879b4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-03-07 (Sat, 07 Mar 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-03-07 20:09:44 +01:00
vanhofen
021e941a5d yWeb: icons cleanup; big thanks to fred_feuerstein
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7f5a8aebfd
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-02-26 (Thu, 26 Feb 2015)

Origin message was:
------------------
- yWeb: icons cleanup; big thanks to fred_feuerstein

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-02-26 00:19:04 +01:00
Stefan Seyfried
f5d3bb2d9f Merge remote-tracking branch 'check/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 22dd798325
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-25 (Wed, 25 Feb 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-02-25 21:20:22 +01:00
Jacek Jendrzej
89c4d607d5 nhttpd: neutrinoapi.cpp disable unused func
Origin commit data
------------------
Branch: ni/coolstream
Commit: 35c5faac67
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-02-24 (Tue, 24 Feb 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-02-24 18:05:52 +01:00
Stefan Seyfried
31c7317205 Merge remote-tracking branch 'check/cst-next'
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 66adad0811
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-07 (Sat, 07 Feb 2015)



------------------
This commit was generated by Migit
2015-02-07 23:12:01 +01:00
[CST] Focus
b492148034 eitd: as long as neutrino using only first content classification,
reduce content classification caching (leaving old code with ifdef)


Origin commit data
------------------
Branch: ni/coolstream
Commit: e8700de2b7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-30 (Fri, 30 Jan 2015)



------------------
This commit was generated by Migit
2015-01-30 19:47:30 +03:00
Jacek Jendrzej
e9483cd66e make channel_id private, use getChannelID()
Origin commit data
------------------
Branch: ni/coolstream
Commit: c624505818
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-29 (Thu, 29 Jan 2015)

Origin message was:
------------------
 make channel_id private, use getChannelID()

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-01-29 14:58:09 +01:00
Stefan Seyfried
190c9bb2a7 fix 64bit format string warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: c41c7b3002
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-27 (Tue, 27 Jan 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-01-27 10:58:43 +01:00
Stefan Seyfried
2263c8bd2e Merge remote-tracking branch 'check/cst-next'
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)



------------------
This commit was generated by Migit
2015-01-26 17:26:26 +01:00
Jacek Jendrzej
5afc24dc67 use empty to check string
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b5e7b5ba3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-09 (Fri, 09 Jan 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-01-09 17:15:11 +01:00
Jacek Jendrzej
5288c70665 neutrino use check empty() instead of length() or size()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8023a6317b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-03 (Sat, 03 Jan 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-01-03 17:51:08 +01:00
Stefan Seyfried
f76a607799 add CFLAGS for libsigc
Origin commit data
------------------
Branch: ni/coolstream
Commit: a92eb8f8e7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-02 (Fri, 02 Jan 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-01-02 21:00:18 +01:00
Stefan Seyfried
770e405c50 Merge remote-tracking branch 'check/cst-next'
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)



------------------
This commit was generated by Migit
2014-12-28 12:32:12 +01:00
Stefan Seyfried
f8f6c58bdc add CFLAGS for libsigc
Origin commit data
------------------
Branch: ni/coolstream
Commit: 41dd237498
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-12-25 18:11:36 +01:00
Stefan Seyfried
c8e3ec41a9 Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)



------------------
This commit was generated by Migit
2014-12-25 18:03:08 +01:00
Jacek Jendrzej
d3f0ce3dc5 nhttpd - fix select audio pid in live (vlc) mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: f236b4807b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-12-23 (Tue, 23 Dec 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-12-23 17:45:17 +01:00
vanhofen
526400e413 controlapi: fix horrible typo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 069defa31c
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-05 (Fri, 05 Dec 2014)

Origin message was:
------------------
- controlapi: fix horrible typo

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-12-06 09:36:29 +01:00
vanhofen
d10141dde1 controlapi: cleanup from unused esound rests
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ff65299d2
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-05 (Fri, 05 Dec 2014)

Origin message was:
------------------
- controlapi: cleanup from unused esound rests

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-12-06 09:36:23 +01:00
Jacek Jendrzej
a945830c8b nhttpd controlapi: change for subchannel to subchannel zap
Origin commit data
------------------
Branch: ni/coolstream
Commit: c8f0c68cf6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-06 (Thu, 06 Nov 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-11-06 14:38:30 +01:00
Christian Schuett
5938d70f36 nhttpd controlapi: allow zapping to subchannels
based on idea by Moritz Venn <moritz.venn@freaque.net>

Signed-off-by: Christian Schuett <Gaucho316@hotmail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 59ca850ecc
Author: Christian Schuett <Gaucho316@hotmail.com>
Date: 2014-11-02 (Sun, 02 Nov 2014)



------------------
This commit was generated by Migit
2014-11-05 09:20:02 +01:00
Jacek Jendrzej
12ced06e44 nhttpd:controlapi.cpp fix getallsubchannels
Origin commit data
------------------
Branch: ni/coolstream
Commit: 847b08aedb
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-05 (Wed, 05 Nov 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-11-05 09:20:02 +01:00
martii
070b342de4 overload access(2)
Conflicts:
	src/driver/pictureviewer/pictureviewer.cpp
	src/gui/components/cc_item_picture.cpp
	src/gui/movieplayer.cpp
	src/gui/osdlang_setup.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.h
	src/system/setting_helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 81ca577fb8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-30 (Sun, 30 Jun 2013)



------------------
This commit was generated by Migit
2014-09-24 19:50:35 +04:00
Benny
364afbec33 add localization tag for time elapsed/remaining
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f16c9441e
Author: Benny <Benny@users.noreply.github.com>
Date: 2014-09-23 (Tue, 23 Sep 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-09-23 12:46:40 +02:00
[CST] Focus
40dae113bc webtv channels integration port,
initial code (C) martii,
initial patch from jacek


Origin commit data
------------------
Branch: ni/coolstream
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)



------------------
This commit was generated by Migit
2014-08-27 17:32:26 +04:00
martii
9e2ad55568 nttpd: allow sendfile() to cope with files >= 2GB; introduce range support
(This re-applies most of the patches I've reverted about two hours ago.)


Origin commit data
------------------
Branch: ni/coolstream
Commit: ff46970457
Author: martii <m4rtii@gmx.de>
Date: 2014-07-20 (Sun, 20 Jul 2014)



------------------
This commit was generated by Migit
2014-08-26 17:31:57 +04:00
Jacek Jendrzej
56f7daa01a Revert "nhttpd: let sendfile() support files >= 2GB"
This reverts commit 9842afecad8dfb91dfd7221aedbeaf5379a89534.


Origin commit data
------------------
Branch: ni/coolstream
Commit: cf0bf3fa20
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-08-17 (Sun, 17 Aug 2014)



------------------
This commit was generated by Migit
2014-08-26 17:31:48 +04:00
martii
24f9a990b4 nhttpd: let sendfile() support files >= 2GB
Origin commit data
------------------
Branch: ni/coolstream
Commit: d71958ba8c
Author: martii <m4rtii@gmx.de>
Date: 2014-07-20 (Sun, 20 Jul 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-08-26 17:31:22 +04:00
vanhofen
e99fb152b2 neutrinoyparser: detect Zee²; fix Boxmodel for Trinity
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8322c9e408
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-27 (Fri, 27 Jun 2014)

Origin message was:
------------------
- neutrinoyparser: detect Zee²; fix Boxmodel for Trinity

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-06-27 10:41:01 +02:00
Stefan Seyfried
8df9ff12cc Merge remote-tracking branch 'check/next-cc'
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)



------------------
This commit was generated by Migit
2014-04-27 19:14:06 +02:00