Commit Graph

9922 Commits

Author SHA1 Message Date
vanhofen
7330331741 epgplus.cpp: reformat; no binary changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 895624b878
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- epgplus.cpp: reformat; no binary changes

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

------------------
This commit was generated by Migit
2017-04-08 14:11:27 +02:00
vanhofen
b0231efacf epgplus.h: reformat; no binary changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 491efb3a05
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- epgplus.h: reformat; no binary changes

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

------------------
This commit was generated by Migit
2017-04-08 14:11:27 +02:00
Michael Liebmann
d9db964ef1 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: c8861ea465
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-04-08 (Sat, 08 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-08 08:30:42 +02:00
Thilo Graf
16480e20bd CComponentsItem: disable unused variable
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6135a827da
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-08 08:24:41 +02:00
Thilo Graf
aff38bfe4b CComponentsFooter: add missing member inits
Origin commit data
------------------
Branch: ni/coolstream
Commit: 47fceca188
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-07 (Fri, 07 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-08 08:16:05 +02:00
Thilo Graf
ae01284ad5 CComponentsHeader: add methode initRepaintSlot() and considered parent
Required in sub classes. Considering of parent ensures usage of
required background color in sub classes.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3e342a7661
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-07 (Fri, 07 Apr 2017)



------------------
This commit was generated by Migit
2017-04-08 08:16:01 +02:00
Thilo Graf
30006a4d5a CCDraw: remove some debug lines, and override comparisons
This should reduce some effort in this method.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 62a2a29a12
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-07 (Fri, 07 Apr 2017)



------------------
This commit was generated by Migit
2017-04-08 08:15:54 +02:00
Thilo Graf
0b5e8114ad CComponentsItem: fix possible artefacts if fb box is smaller the radius
If box height/2 is smaller than corner radius it is possible
we have artefacts after killed or hided fb box. This effect only I have seen
with full hd resolution, in hd ready mode it was ok.
Sideeffects with this changes I have not seen, but I can't exclude. Must be watched.


Origin commit data
------------------
Branch: ni/coolstream
Commit: bad5f02c06
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-07 (Fri, 07 Apr 2017)



------------------
This commit was generated by Migit
2017-04-08 08:15:49 +02:00
Thilo Graf
239d33c1fc CComponentsButton: remove unused member
Origin commit data
------------------
Branch: ni/coolstream
Commit: c9152beada
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-07 (Fri, 07 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-08 08:15:45 +02:00
Thilo Graf
6c68701abf CCDraw: fix wrong intit values for corners and position
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d45fbb4eb
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-07 (Fri, 07 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-08 08:15:41 +02:00
Thilo Graf
8c23e7cc90 CComponentsFrmClock: add members to control segment refreshing on interval
Refreshing of segments is now enabled on default.
In certain conditions this should be better.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 511486c404
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-07 (Fri, 07 Apr 2017)



------------------
This commit was generated by Migit
2017-04-07 22:00:33 +02:00
vanhofen
46e6ffd307 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 091ea929e6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-31 (Fri, 31 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-31 17:42:16 +02:00
vanhofen
fcb3a99ce0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ecb0bdca43
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-31 (Fri, 31 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-31 17:42:07 +02:00
Michael Liebmann
cc62253f33 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1f6555ec46
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-31 (Fri, 31 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-31 10:13:10 +02:00
Thilo Graf
ed105ffa82 Lua: try to implement progresswindow
Origin commit data
------------------
Branch: ni/coolstream
Commit: 83cfd68f88
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-31 (Fri, 31 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-31 10:12:35 +02:00
Thilo Graf
04c49e5006 LUA-Api: add alignment parameter for text in window header
Possible modes are :
	* "DEFAULT" (left)
	* "CENTER"
	* "RIGHT"

TODO: doc


Origin commit data
------------------
Branch: ni/coolstream
Commit: a788eee298
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-31 (Fri, 31 Mar 2017)



------------------
This commit was generated by Migit
2017-03-31 10:12:35 +02:00
vanhofen
5c0f53bc08 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 940429c18a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-30 (Thu, 30 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-30 23:21:39 +02:00
vanhofen
156d43cedb neutrino: add fribidi support; ported from mohousch's nhd2
This requires libfribidi and a font with arabic or hebrew glyphs.
To build libfribidi add something like this to your makefiles:

FRIBIDI_VER = 0.19.7
$(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2:
	$(WGET) https://fribidi.org/download/fribidi-$(FRIBIDI_VER).tar.bz2

$(D)/libfribidi: $(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2 | $(TARGETPREFIX)
	$(REMOVE)/fribidi-$(FRIBIDI_VER)
	$(UNTAR)/fribidi-$(FRIBIDI_VER).tar.bz2
	set -e; cd $(BUILD_TMP)/fribidi-$(FRIBIDI_VER); \
		$(CONFIGURE) \
			--prefix= \
			--mandir=/.remove \
			--disable-debug \
			--disable-deprecated \
			--enable-charsets \
			--with-glib=no \
			; \
		$(MAKE); \
		$(MAKE) install DESTDIR=$(TARGETPREFIX)
	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/fribidi.pc
	$(REWRITE_LIBTOOL)/libfribidi.la
	$(REMOVE)/fribidi-$(FRIBIDI_VER)
	touch $@

If you want to link libfribidi statically add --disable-shared
and --enable-static to configure call.


Origin commit data
------------------
Branch: ni/coolstream
Commit: ffcb1ec609
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-30 (Thu, 30 Mar 2017)

Origin message was:
------------------
- neutrino: add fribidi support; ported from mohousch's nhd2

This requires libfribidi and a font with arabic or hebrew glyphs.
To build libfribidi add something like this to your makefiles:

FRIBIDI_VER = 0.19.7
$(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2:
	$(WGET) https://fribidi.org/download/fribidi-$(FRIBIDI_VER).tar.bz2

$(D)/libfribidi: $(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2 | $(TARGETPREFIX)
	$(REMOVE)/fribidi-$(FRIBIDI_VER)
	$(UNTAR)/fribidi-$(FRIBIDI_VER).tar.bz2
	set -e; cd $(BUILD_TMP)/fribidi-$(FRIBIDI_VER); \
		$(CONFIGURE) \
			--prefix= \
			--mandir=/.remove \
			--disable-debug \
			--disable-deprecated \
			--enable-charsets \
			--with-glib=no \
			; \
		$(MAKE); \
		$(MAKE) install DESTDIR=$(TARGETPREFIX)
	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/fribidi.pc
	$(REWRITE_LIBTOOL)/libfribidi.la
	$(REMOVE)/fribidi-$(FRIBIDI_VER)
	touch $@

If you want to link libfribidi statically add --disable-shared
and --enable-static to configure call.


------------------
This commit was generated by Migit
2017-03-30 23:14:11 +02:00
vanhofen
32fa0cfdf3 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: fdd22d414d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-29 21:01:22 +02:00
vanhofen
440e157ad5 locale: minor changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 923daa87da
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)

Origin message was:
------------------
- locale: minor changes

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

------------------
This commit was generated by Migit
2017-03-29 08:11:36 +02:00
vanhofen
1a928cce60 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1107088c0b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)



------------------
This commit was generated by Migit
2017-03-29 08:05:10 +02:00
Michael Liebmann
3a34afe94e Fix videosystem auto mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: b612c1f620
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-28 (Tue, 28 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-28 23:56:57 +02:00
Michael Liebmann
8090c48f2f fb_accel hd1/hd2: Add fb_accel_cs_hdx.cpp for common functions
- Add 'class CFbAccelCSHDx' to fb_accel.h
 - Some small code updates


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c1f2bfe05
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-28 (Tue, 28 Mar 2017)



------------------
This commit was generated by Migit
2017-03-28 23:56:57 +02:00
Michael Liebmann
6823a03aa4 lib/libtuxtxt/tuxtxt.cpp: Update for hd1/hd2
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e08f4cb92
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-28 (Tue, 28 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-28 23:56:57 +02:00
Michael Liebmann
352b7f75f8 CStreamInfo2: Add new info items
- Videosystem
 - OSD Resolution


Origin commit data
------------------
Branch: ni/coolstream
Commit: f7cea75f37
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-28 (Tue, 28 Mar 2017)



------------------
This commit was generated by Migit
2017-03-28 23:56:57 +02:00
Michael Liebmann
2cb6e23686 CFbAccelCSHD[1|2]::setMode(): Insert cVideo::updateOsdScreenInfo()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 40a4ec4262
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-28 (Tue, 28 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-28 23:56:56 +02:00
Michael Liebmann
55713c92e3 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5e00bc5b4c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-28 (Tue, 28 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-28 21:54:01 +02:00
vanhofen
f867d99444 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: b4adf56866
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-28 21:28:54 +02:00
vanhofen
99b8e43a28 jsoncpp: update to current version 1.8.0
Use amalgamated src from https://github.com/open-source-parsers/jsoncpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: b945336a79
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)

Origin message was:
------------------
- jsoncpp: update to current version 1.8.0

Use amalgamated src from https://github.com/open-source-parsers/jsoncpp


------------------
This commit was generated by Migit
2017-03-28 21:23:10 +02:00
vanhofen
d1bc7c4e6a Revert "- jsoncpp: update to current version 1.8.0; align Makefile.am"
This reverts commit fa69b2e2ba, because
some people has build-problems.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 78e519f694
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)



------------------
This commit was generated by Migit
2017-03-28 21:10:27 +02:00
vanhofen
8941a52ade framebuffer_hd1: fix c/p error in 3fb3817563
Origin commit data
------------------
Branch: ni/coolstream
Commit: e83357964e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)

Origin message was:
------------------
- framebuffer_hd1: fix c/p error in 3fb3817563

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

------------------
This commit was generated by Migit
2017-03-28 13:15:20 +02:00
vanhofen
3fb3817563 framebuffer: fix unscaled paintings; this fixes our starbar
Origin commit data
------------------
Branch: ni/coolstream
Commit: f6f1a71b39
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)

Origin message was:
------------------
- framebuffer: fix unscaled paintings; this fixes our starbar

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

------------------
This commit was generated by Migit
2017-03-28 12:36:26 +02:00
vanhofen
4c98def5df Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ef5217fd6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-28 11:35:23 +02:00
vanhofen
fa69b2e2ba jsoncpp: update to current version 1.8.0; align Makefile.am
Re-split into original files and use original directory structure.
Files are picked from https://github.com/open-source-parsers/jsoncpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 760a64fc6a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)

Origin message was:
------------------
- jsoncpp: update to current version 1.8.0; align Makefile.am

Re-split into original files and use original directory structure.
Files are picked from https://github.com/open-source-parsers/jsoncpp


------------------
This commit was generated by Migit
2017-03-28 11:22:41 +02:00
vanhofen
e71c06c5aa imdb: fix segfaults whe api is changed; we only grab what we need
Origin commit data
------------------
Branch: ni/coolstream
Commit: 85a0b5bdb7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-27 (Mon, 27 Mar 2017)

Origin message was:
------------------
- imdb: fix segfaults whe api is changed; we only grab what we need

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

------------------
This commit was generated by Migit
2017-03-27 23:12:53 +02:00
vanhofen
245341e85f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: c7bb1c67e6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-27 (Mon, 27 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-27 08:13:11 +02:00
vanhofen
d5d3ffec8e upnpbrowser: fix neutrino mode while playing audio
Origin commit data
------------------
Branch: ni/coolstream
Commit: 81078780db
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-27 (Mon, 27 Mar 2017)

Origin message was:
------------------
- upnpbrowser: fix neutrino mode while playing audio

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

------------------
This commit was generated by Migit
2017-03-27 08:11:49 +02:00
vanhofen
bd1b3c210a upnpbrowser: reduce console output in updateTimes()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 324359d31d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-27 (Mon, 27 Mar 2017)

Origin message was:
------------------
- upnpbrowser: reduce console output in updateTimes()

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

------------------
This commit was generated by Migit
2017-03-27 08:11:49 +02:00
vanhofen
4315ea0358 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 05a86d3576
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-26 (Sun, 26 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-26 23:55:57 +02:00
vanhofen
dc17e7f450 upnpbrowser: reduce console output in selectDevice()
Origin commit data
------------------
Branch: ni/coolstream
Commit: f10ecb6667
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-26 (Sun, 26 Mar 2017)

Origin message was:
------------------
- upnpbrowser: reduce console output in selectDevice()

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

------------------
This commit was generated by Migit
2017-03-26 23:31:08 +02:00
vanhofen
ad129ee746 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: b435c29e1d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-26 (Sun, 26 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-26 23:24:10 +02:00
vanhofen
f0c594db2a lcd4l: add support for mode_upnp; ...
use Getfile() instead of pretty_name in mode_ts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 902e4e918d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-26 (Sun, 26 Mar 2017)

Origin message was:
------------------
- lcd4l: add support for mode_upnp; ...

use Getfile() instead of pretty_name in mode_ts


------------------
This commit was generated by Migit
2017-03-26 23:23:01 +02:00
vanhofen
3ba4cfb126 menue: fix lcd4l-support for directly started items; ...
this fixes missing lcd4l-support in mode_upnp


Origin commit data
------------------
Branch: ni/coolstream
Commit: da62cd195b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-26 (Sun, 26 Mar 2017)

Origin message was:
------------------
- menue: fix lcd4l-support for directly started items; ...

this fixes missing lcd4l-support in mode_upnp


------------------
This commit was generated by Migit
2017-03-26 23:21:29 +02:00
vanhofen
b80fd4d8c3 movieplayer.h: revert some NI-changes; ...
we can use GetFile() instead of pretty_name


Origin commit data
------------------
Branch: ni/coolstream
Commit: 71569a1132
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-26 (Sun, 26 Mar 2017)

Origin message was:
------------------
- movieplayer.h: revert some NI-changes; ...

we can use GetFile() instead of pretty_name


------------------
This commit was generated by Migit
2017-03-26 23:20:14 +02:00
vanhofen
3cf7452c69 lcd4l: try to fix display of webtv-channels on external lcd; pt. 2
Origin commit data
------------------
Branch: ni/coolstream
Commit: 27a925ab28
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-24 (Fri, 24 Mar 2017)

Origin message was:
------------------
- lcd4l: try to fix display of webtv-channels on external lcd; pt. 2

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

------------------
This commit was generated by Migit
2017-03-24 21:26:21 +01:00
Michael Liebmann
c2d87de865 CFbAccelCSHD2::setMode: Fix if ENABLE_CHANGE_OSD_RESOLUTION is not defined
Origin commit data
------------------
Branch: ni/coolstream
Commit: 515ab1fe59
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-23 (Thu, 23 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-23 21:32:48 +01:00
Michael Liebmann
968e1ce9c0 src/neutrino.cpp: Simplification EVT_AUTO_SET_VIDEOSYSTEM handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: ea18657562
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-23 (Thu, 23 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-23 21:32:48 +01:00
vanhofen
b8f9f2dd4e Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5e594cb250
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-23 (Thu, 23 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-23 21:23:00 +01:00
vanhofen
fb73c5ab06 acinclude.m4: fix merge error
Origin commit data
------------------
Branch: ni/coolstream
Commit: d0e7145f37
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-23 (Thu, 23 Mar 2017)

Origin message was:
------------------
- acinclude.m4: fix merge error

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

------------------
This commit was generated by Migit
2017-03-23 19:00:57 +01:00
Michael Liebmann
1eb46311d5 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: d9ce33a69a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-23 (Thu, 23 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-23 18:58:48 +01:00