Commit Graph

733 Commits

Author SHA1 Message Date
Jacek Jendrzej
4a4e1065b2 tuxtxt.cpp fix possible memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: bfd8adb61e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2019-04-06 (Sat, 06 Apr 2019)


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

------------------
This commit was generated by Migit
2019-04-06 13:42:03 +02:00
Frankenstone
244d1d9447 fix ffmpeg compiler warnings, thx DboxOldie
Origin commit data
------------------
Branch: ni/coolstream
Commit: 48882de906
Author: Frankenstone <dampf_acc@online.de>
Date: 2019-02-27 (Wed, 27 Feb 2019)


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

------------------
This commit was generated by Migit
2019-02-27 23:25:44 +01:00
Thilo Graf
e6e7b76f5a lib/xmltree/gzstream.h: fix possible Wshadow warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 822e075111
Author: Thilo Graf <dbt@novatux.de>
Date: 2019-02-16 (Sat, 16 Feb 2019)


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

------------------
This commit was generated by Migit
2019-02-16 23:19:05 +01:00
vanhofen
a43f04cfb3 lib/hardware: align to latest changes in libstb-hal repo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a7c27e6e0
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-23 (Sun, 23 Dec 2018)

Origin message was:
------------------
- lib/hardware: align to latest changes in libstb-hal repo

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

------------------
This commit was generated by Migit
2018-12-23 22:35:01 +01:00
vanhofen
6c3b341910 move playback.h compatibility header file to the other ones
Origin commit data
------------------
Branch: ni/coolstream
Commit: b87b7d3c49
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-22 (Sat, 22 Dec 2018)

Origin message was:
------------------
- move playback.h compatibility header file to the other ones

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

------------------
This commit was generated by Migit
2018-12-22 20:17:24 +01:00
vanhofen
91d49e3fc5 introduce ca.h compatibility header file
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1ff464ad79
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-22 (Sat, 22 Dec 2018)

Origin message was:
------------------
- introduce ca.h compatibility header file

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

------------------
This commit was generated by Migit
2018-12-22 20:17:23 +01:00
vanhofen
1e70a1fcc9 introduce record.h compatibility header file
Origin commit data
------------------
Branch: ni/coolstream
Commit: 53612d7225
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-22 (Sat, 22 Dec 2018)

Origin message was:
------------------
- introduce record.h compatibility header file

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

------------------
This commit was generated by Migit
2018-12-22 10:06:47 +01:00
vanhofen
774b23685e move compatibility headers to /lib/hardware
Origin commit data
------------------
Branch: ni/coolstream
Commit: 651a56aab8
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-21 (Fri, 21 Dec 2018)

Origin message was:
------------------
- move compatibility headers to /lib/hardware

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

------------------
This commit was generated by Migit
2018-12-21 22:30:34 +01:00
GetAway
baaea9ec6f videosettings.cpp: use hw_caps->has_button_vformat
Origin commit data
------------------
Branch: ni/coolstream
Commit: cf07ebb3b1
Author: GetAway <get-away@t-online.de>
Date: 2018-12-01 (Sat, 01 Dec 2018)


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

------------------
This commit was generated by Migit
2018-12-01 18:03:25 +01:00
Jacek Jendrzej
fcea282417 tuxtxt: fix global buffer overflow line 4753 in tuxtxt.cpp if Char is 0xF5 or 0xF6
Origin commit data
------------------
Branch: ni/coolstream
Commit: c746c25153
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2018-11-22 (Thu, 22 Nov 2018)


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

------------------
This commit was generated by Migit
2018-11-22 21:26:05 +01:00
TangoCash
5ac4a438c0 fix xml utf8 detection
Origin commit data
------------------
Branch: ni/coolstream
Commit: 08b8505da6
Author: TangoCash <eric@loxat.de>
Date: 2018-10-27 (Sat, 27 Oct 2018)


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

------------------
This commit was generated by Migit
2018-10-27 19:08:17 +02:00
TangoCash
5a35175531 remotetimers: fix fetch from other box
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3eaac8f0d9
Author: TangoCash <eric@loxat.de>
Date: 2018-10-13 (Sat, 13 Oct 2018)


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

------------------
This commit was generated by Migit
2018-10-13 00:11:06 +02:00
J. Krieg
1642db7b11 src/gui-neutrino/lib/xmltree/xmlinterface.cpp: fix build when compiling with -Werror
because with this the warning:
 warning: 'xmlgz_file' may be used uninitialized in this function [-Wmaybe-uninitialized]
 warning: 'xml_file' may be used uninitialized in this function [-Wmaybe-uninitialized]
is treated as an error and the build aborts - so let's remove this warning...

Thanks to Janus for reporting this and the suggested fix

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13ab6e92a0
Author: J. Krieg <bellum07@googlemail.com>
Date: 2018-09-02 (Sun, 02 Sep 2018)

Origin message was:
------------------
src/gui-neutrino/lib/xmltree/xmlinterface.cpp: fix build when compiling with -Werror

because with this the warning:
 warning: 'xmlgz_file' may be used uninitialized in this function [-Wmaybe-uninitialized]
 warning: 'xml_file' may be used uninitialized in this function [-Wmaybe-uninitialized]
is treated as an error and the build aborts - so let's remove this warning...

Thanks to Janus for reporting this and the suggested fix

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2018-09-02 21:21:03 +02:00
vanhofen
ada2fe635e eitd/sectionsdclient: unify new code and call it as it is ... it is XMLTV; ...
fix another compiler warning: the use of `tmpnam' is dangerous


Origin commit data
------------------
Branch: ni/coolstream
Commit: 04c41bfb83
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-09-01 (Sat, 01 Sep 2018)

Origin message was:
------------------
- eitd/sectionsdclient: unify new code and call it as it is ... it is XMLTV; ...

fix another compiler warning: the use of `tmpnam' is dangerous


------------------
This commit was generated by Migit
2018-09-01 15:58:24 +02:00
TangoCash
26d32001f6 add option to read (online) xmltv epg
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8ad9f2e35c
Author: TangoCash <eric@loxat.de>
Date: 2018-09-01 (Sat, 01 Sep 2018)


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

------------------
This commit was generated by Migit
2018-09-01 15:58:24 +02:00
vanhofen
c10aa28be5 xmlinterface: fix compiling for CST hardware
error was: ‘pugi::xml_parse_status’ is not a class or namespace


Origin commit data
------------------
Branch: ni/coolstream
Commit: cce09cc440
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-08-30 (Thu, 30 Aug 2018)

Origin message was:
------------------
- xmlinterface: fix compiling for CST hardware

error was: ‘pugi::xml_parse_status’ is not a class or namespace


------------------
This commit was generated by Migit
2018-08-30 23:58:40 +02:00
vanhofen
ed1d57c97a add gzstream.h to fix 9022302b5d
Origin commit data
------------------
Branch: ni/coolstream
Commit: 08855c2b6b
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-08-30 (Thu, 30 Aug 2018)

Origin message was:
------------------
- add gzstream.h to fix 9022302b5d

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

------------------
This commit was generated by Migit
2018-08-30 22:29:14 +02:00
TangoCash
9022302b5d add reading from gzipped xml files (xxx.xml.gz)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bcce912b2
Author: TangoCash <eric@loxat.de>
Date: 2018-08-22 (Wed, 22 Aug 2018)


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

------------------
This commit was generated by Migit
2018-08-30 21:58:38 +02:00
Stefan Seyfried
c5db7a1ce8 tuxtxt: remove unused var_screeninfo.yoffset (always 0)
Origin commit data
------------------
Branch: ni/coolstream
Commit: fc421284e1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-06-24 (Sun, 24 Jun 2018)


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

------------------
This commit was generated by Migit
2018-06-24 15:03:34 +02:00
Stefan Seyfried
f46d034e4e tuxtxt: fix framebuffer blitting for SPARK
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1506b35f7b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-06-21 (Thu, 21 Jun 2018)


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

------------------
This commit was generated by Migit
2018-06-21 21:38:23 +02:00
Stefan Seyfried
0f41651247 tuxtxt: use one global CFrameBuffer variable
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f22e740f8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-06-21 (Thu, 21 Jun 2018)


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

------------------
This commit was generated by Migit
2018-06-21 21:38:23 +02:00
vanhofen
2b42c72182 hardware_caps: introduce caps.has_button_timer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c3decd04a
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-03-11 (Sun, 11 Mar 2018)

Origin message was:
------------------
- hardware_caps: introduce caps.has_button_timer

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

------------------
This commit was generated by Migit
2018-03-11 22:43:23 +01:00
Stefan Seyfried
d4b2279be5 tuxtxt: fix unused variable warning
Origin commit data
------------------
Branch: ni/coolstream
Commit: d491602bd0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-02-25 (Sun, 25 Feb 2018)


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

------------------
This commit was generated by Migit
2018-02-25 21:36:45 +01:00
Stefan Seyfried
896b247966 tuxtxt: use demux 0
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8ed14947e6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-02-25 (Sun, 25 Feb 2018)


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

------------------
This commit was generated by Migit
2018-02-25 21:36:45 +01:00
Stefan Seyfried
febe9ba1db tuxtxt: use blit2FB instead of handmade mem copy
This gets rid of most hardware specific code in tuxtxt


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7899eb519c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-02-25 (Sun, 25 Feb 2018)



------------------
This commit was generated by Migit
2018-02-25 21:36:45 +01:00
Stefan Seyfried
46f582000f tuxtxt: use framebuffer function for painting boxes
Origin commit data
------------------
Branch: ni/coolstream
Commit: c317bb93fe
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-02-25 (Sun, 25 Feb 2018)


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

------------------
This commit was generated by Migit
2018-02-25 21:36:45 +01:00
Stefan Seyfried
221928c3e9 tuxtxt: fix display of line25 in zoom mode
[vanhofen: was already ok in our code; just aligning code format]


Origin commit data
------------------
Branch: ni/coolstream
Commit: 25123fa63d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-02-18 (Sun, 18 Feb 2018)



------------------
This commit was generated by Migit
2018-02-19 21:15:16 +01:00
Stefan Seyfried
67047b866f xmlinterface: fix broken to_utf8() algorithm
Origin commit data
------------------
Branch: ni/coolstream
Commit: bc5d6b739b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-01-28 (Sun, 28 Jan 2018)


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

------------------
This commit was generated by Migit
2018-01-28 20:34:23 +01:00
vanhofen
e718e6217c tuxtxt2.conf: align to hardcoded values; align to our current font; install to image
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6250ccc022
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-25 (Thu, 25 Jan 2018)

Origin message was:
------------------
- tuxtxt2.conf: align to hardcoded values; align to our current font; install to image

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

------------------
This commit was generated by Migit
2018-01-25 14:34:38 +01:00
vanhofen
1eaa2f0951 libtuxtxt: some more whitespace cleanups
Origin commit data
------------------
Branch: ni/coolstream
Commit: e8baddc1e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-25 (Thu, 25 Jan 2018)

Origin message was:
------------------
- libtuxtxt: some more whitespace cleanups

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

------------------
This commit was generated by Migit
2018-01-25 13:30:14 +01:00
vanhofen
7f6eeb2be4 libtuxtxt: ports from martii's neutrino-mp ...
* port screenmode handling
* switch from bgra to argb color handling
* port font rendering improvement


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e54af7726
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-25 (Thu, 25 Jan 2018)

Origin message was:
------------------
- libtuxtxt: ports from martii's neutrino-mp ...

* port screenmode handling
* switch from bgra to argb color handling
* port font rendering improvement


------------------
This commit was generated by Migit
2018-01-25 13:30:14 +01:00
vanhofen
0f70fd0450 libtuxtxt: move overloaded members directly to the matching functions
Origin commit data
------------------
Branch: ni/coolstream
Commit: 88fcd8bf8d
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-25 (Thu, 25 Jan 2018)

Origin message was:
------------------
- libtuxtxt: move overloaded members directly to the matching functions

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

------------------
This commit was generated by Migit
2018-01-25 13:30:14 +01:00
vanhofen
29940c5231 libtuxtxt: whitespace cleanup; leading eight spaces => tab
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e1f4d2242
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-25 (Thu, 25 Jan 2018)

Origin message was:
------------------
- libtuxtxt: whitespace cleanup; leading eight spaces => tab

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

------------------
This commit was generated by Migit
2018-01-25 13:30:14 +01:00
max_10
c7e370fab1 libtuxtxt: minor clean-up, no code change
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1742453a06
Author: max_10 <max_10@gmx.de>
Date: 2018-01-25 (Thu, 25 Jan 2018)


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

------------------
This commit was generated by Migit
2018-01-25 13:30:14 +01:00
vanhofen
e79b6fb6b5 libtuxtxt: cleanup unused lcd code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f01e9c62a
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-25 (Thu, 25 Jan 2018)

Origin message was:
------------------
- libtuxtxt: cleanup unused lcd code

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

------------------
This commit was generated by Migit
2018-01-25 13:30:14 +01:00
vanhofen
a3239a2806 Revert "- tuxtxt: align to mp"
This reverts commit 47b10fba4c.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 16fa8e6b8f
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-25 (Thu, 25 Jan 2018)



------------------
This commit was generated by Migit
2018-01-25 13:30:14 +01:00
vanhofen
59d99e8620 Revert "- tuxtxt: port smooth font rendering from martii's neutrino mp"
This reverts commit 90f7c764f4.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4187302886
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-25 (Thu, 25 Jan 2018)



------------------
This commit was generated by Migit
2018-01-25 13:30:13 +01:00
vanhofen
166c6511f3 tuxtxt: disable unused defines for alternative fonts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4f6ba14875
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-23 (Tue, 23 Jan 2018)

Origin message was:
------------------
- tuxtxt: disable unused defines for alternative fonts

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

------------------
This commit was generated by Migit
2018-01-23 20:57:29 +01:00
vanhofen
90f7c764f4 tuxtxt: port smooth font rendering from martii's neutrino mp
* cleanup code
* fix man indentations


Origin commit data
------------------
Branch: ni/coolstream
Commit: ca5e41e8cb
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-23 (Tue, 23 Jan 2018)

Origin message was:
------------------
- tuxtxt: port smooth font rendering from martii's neutrino mp

* cleanup code
* fix man indentations


------------------
This commit was generated by Migit
2018-01-23 20:57:29 +01:00
vanhofen
487097fc8d libcoolstream-headers: remove obsolete dummy members
Origin commit data
------------------
Branch: ni/coolstream
Commit: f2aff125c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)

Origin message was:
------------------
- libcoolstream-headers: remove obsolete dummy members

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

------------------
This commit was generated by Migit
2018-01-03 11:55:54 +01:00
vanhofen
a0cce78210 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	data/icons/buttons/btn_record_active.png
	data/icons/buttons/gelb.png
	data/icons/buttons/gruen.png
	data/icons/buttons/rot.png
	data/icons/headers/icon_green.png
	data/icons/headers/icon_red.png
	data/icons/headers/icon_yellow.png
	data/icons/status/various/lock.png
	data/pictures/backgrounds/1280x720/shutdown.jpg
	data/pictures/backgrounds/1280x720/start.jpg
	src/driver/streamts.cpp
	src/gui/plugins.h
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 74aab8ddd2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-28 (Tue, 28 Nov 2017)



------------------
This commit was generated by Migit
2017-11-28 10:31:10 +01:00
vanhofen
59ffd5a265 hardware_caps: fix compile for coolstream; add missing member to header
Origin commit data
------------------
Branch: ni/coolstream
Commit: 06036f2387
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)

Origin message was:
------------------
- hardware_caps: fix compile for coolstream; add missing member to header

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

------------------
This commit was generated by Migit
2017-11-13 20:59:39 +01:00
vanhofen
463fe111c0 hardware_caps: add display_has_statusline member
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2eeeb3fd45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)

Origin message was:
------------------
- hardware_caps: add display_has_statusline member

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

------------------
This commit was generated by Migit
2017-11-13 10:10:45 +01:00
vanhofen
b9fd1ef634 cleanup from unsupported DUCKBOX_HARDWARE
Origin commit data
------------------
Branch: ni/coolstream
Commit: bc0de58721
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-08 (Wed, 08 Nov 2017)

Origin message was:
------------------
- cleanup from unsupported DUCKBOX_HARDWARE

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

------------------
This commit was generated by Migit
2017-11-08 09:28:34 +01:00
vanhofen
88d5909c47 streaminfo: fix compile for coolstream; add dummies to libcs-headers
Origin commit data
------------------
Branch: ni/coolstream
Commit: ff04c8ce97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-07 (Tue, 07 Nov 2017)

Origin message was:
------------------
- streaminfo: fix compile for coolstream; add dummies to libcs-headers

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

------------------
This commit was generated by Migit
2017-11-07 07:49:49 +01:00
vanhofen
4cad288e08 tuxtxt: change some default values
Origin commit data
------------------
Branch: ni/coolstream
Commit: 42e507005b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- tuxtxt: change some default values

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

------------------
This commit was generated by Migit
2017-11-03 23:20:34 +01:00
vanhofen
58aacc0de2 tuxtxt: fix compiler warnings; simplify ifdef's
Origin commit data
------------------
Branch: ni/coolstream
Commit: d90d34e5d2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- tuxtxt: fix compiler warnings; simplify ifdef's

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

------------------
This commit was generated by Migit
2017-11-03 23:05:59 +01:00
vanhofen
47b10fba4c tuxtxt: align to mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a0abfafde
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- tuxtxt: align to mp

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

------------------
This commit was generated by Migit
2017-11-03 23:05:59 +01:00
vanhofen
55daa20bed Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	acinclude.m4
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/lcdd.h
	src/driver/rcinput.cpp
	src/driver/rcinput.h
	src/driver/screenshot.cpp
	src/driver/screenshot.h
	src/driver/simple_display.cpp
	src/driver/vfd.cpp
	src/gui/audio_select.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/movieplayer.h
	src/zapit/include/zapit/capmt.h
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1fa735aa45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)



------------------
This commit was generated by Migit
2017-11-03 00:09:05 +01:00
vanhofen
483c39bef1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	acinclude.m4
	configure.ac
	data/fonts/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	data/webtv/Makefile.am
	data/y-web/Y_Tools_Boxcontrol.yhtm
	data/y-web/Y_Tools_Screenshot.yhtm
	lib/hardware/coolstream/hardware_caps.h
	lib/libtuxtxt/tuxtxt_common.h
	src/gui/audioplayer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/movieplayer.h
	src/gui/network_setup.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: ae4307bc1c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)



------------------
This commit was generated by Migit
2017-11-02 23:25:41 +01:00