Commit Graph

11049 Commits

Author SHA1 Message Date
Stefan Seyfried
949306bfed acinclude: remove old unused cruft
remove:
- unused boxtypes, these only give a false sense of support
- unused configure options and associated #defines in config.h
- unused confiugre check macros


Origin commit data
------------------
Branch: ni/coolstream
Commit: 216a774343
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-22 (Wed, 22 Mar 2017)



------------------
This commit was generated by Migit
2017-03-22 12:11:26 +01:00
vanhofen
84dacb4ba1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d65fa461d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-22 (Wed, 22 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-22 09:56:16 +01:00
Michael Liebmann
bb863722f2 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0cac85205b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-22 (Wed, 22 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-22 01:24:03 +01:00
Michael Liebmann
089f59cc26 hd[1|2]/libcoolstream: Update headers for new libcoolstream functions
libcoolstream-mt.so version 3.2.0 required

 Functions:
 - updateOsdScreenInfo()
 - GetVideoSystem()
 - GetVideoSystemFormatName()
 - fbCopy()
 - fbFill()
 - cs_set_extra_debug()


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

Origin message was:
------------------
hd[1|2]/libcoolstream: Update headers for new libcoolstream functions

 libcoolstream-mt.so version 3.2.0 required

 Functions:
  - updateOsdScreenInfo()
  - GetVideoSystem()
  - GetVideoSystemFormatName()
  - fbCopy()
  - fbFill()
  - cs_set_extra_debug()


------------------
This commit was generated by Migit
2017-03-22 01:23:45 +01:00
vanhofen
515913eecd Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 107a8a1b5f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-21 (Tue, 21 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-21 14:50:23 +01:00
vanhofen
7d167583ef deutsch.locale: remove obsolete rclock.menueadd entry
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3137e15457
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-21 (Tue, 21 Mar 2017)

Origin message was:
------------------
- deutsch.locale: remove obsolete rclock.menueadd entry

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

------------------
This commit was generated by Migit
2017-03-21 14:49:12 +01:00
vanhofen
4bd35f43be Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8ff64d2dc1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-21 (Tue, 21 Mar 2017)


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

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


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

------------------
This commit was generated by Migit
2017-03-21 14:00:05 +01:00
vanhofen
ba30b3009a neutrino: grab whole ExitRun() from neutrino-mp ...
This fixes my last merge commit, small typos and alignes indentation.


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

Origin message was:
------------------
- neutrino: grab whole ExitRun() from neutrino-mp ...

This fixes my last merge commit, small typos and alignes indentation.


------------------
This commit was generated by Migit
2017-03-21 10:29:35 +01:00
vanhofen
7ba5e5e16e Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1373662e31
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-21 (Tue, 21 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-21 10:19:07 +01:00
Michael Liebmann
5b871d8901 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8212746cf1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-20 23:11:33 +01:00
Thilo Graf
037ad21618 CComponentsButton: simplify assignment of button message values
Count of alternate message values was limited to 1 value. Now it is
possible to add any count of message values.

directKey and directKeyAlt were removed from struct type 'button_label_cc'
and directKeys was added as container for possible message values.

Some methods of CComponentsFooter had to be adapted for that.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4eb6a315fc
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-20 (Mon, 20 Mar 2017)



------------------
This commit was generated by Migit
2017-03-20 22:55:05 +01:00
vanhofen
7bc3fd6cfe Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e43defd2a0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-20 (Mon, 20 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-20 21:23:44 +01:00
Jacek Jendrzej
3f6c2e83a2 fix segfault aufter unbreak msgbox 56ddedaa39
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8516b1662d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-20 17:40:26 +01:00
vanhofen
3dc42dfe3c Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/miscsettings_menu.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp


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



------------------
This commit was generated by Migit
2017-03-20 15:53:10 +01:00
vanhofen
eb010cdbd1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/epgview.h
	src/neutrino_menue.cpp


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



------------------
This commit was generated by Migit
2017-03-20 14:34:45 +01:00
vanhofen
cb3b233e6c move movieinfo.cpp|h from src/gui to src/driver ...
because there are no gui-elements included anymore


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b629aafc7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-20 (Mon, 20 Mar 2017)

Origin message was:
------------------
- move movieinfo.cpp|h from src/gui to src/driver ...

because there are no gui-elements included anymore


------------------
This commit was generated by Migit
2017-03-20 14:30:44 +01:00
vanhofen
6c42ccd0bc Revert "- autogen.sh: add 'autoreconf -fi' call"
This reverts commit fee0dfb99a
because it doesn't help


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



------------------
This commit was generated by Migit
2017-03-20 14:14:23 +01:00
vanhofen
d404deb1d2 Merge branch 'master' into pu/mp
Conflicts:
	src/gui/miscsettings_menu.cpp
	src/neutrino.cpp
	src/system/settings.h


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



------------------
This commit was generated by Migit
2017-03-20 01:31:51 +01:00
Michael Liebmann
ae9fdb3dd1 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 73f2aa87d1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-20 00:40:31 +01:00
Michael Liebmann
8ebfd5d23f CNeutrinoApp::InitMenuMain: Fix compiler warning
Origin commit data
------------------
Branch: ni/coolstream
Commit: d2b3a8da68
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-20 00:40:10 +01:00
vanhofen
6a75ab2706 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp
	src/neutrino.h
	src/neutrino_menue.cpp


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



------------------
This commit was generated by Migit
2017-03-20 00:07:18 +01:00
Michael Liebmann
bbf628bf89 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: be49686432
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-20 00:00:35 +01:00
vanhofen
304b71b6dc neutrino: just code cosmetics in ExitRun()
Origin commit data
------------------
Branch: ni/coolstream
Commit: b8a97a97ca
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- neutrino: just code cosmetics in ExitRun()

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

------------------
This commit was generated by Migit
2017-03-19 23:50:52 +01:00
vanhofen
f24af0df57 neutrino: remove unused write_si from ExitRun() function ...
and rename retcode to can_shutdown for a better readability


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

Origin message was:
------------------
- neutrino: remove unused write_si from ExitRun() function ...

and rename retcode to can_shutdown for a better readability


------------------
This commit was generated by Migit
2017-03-19 23:50:52 +01:00
vanhofen
514707f0c8 use g_info.hw_caps->can_shutdown; mostly ported from neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: de1ee8b73a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- use g_info.hw_caps->can_shutdown; mostly ported from neutrino-mp

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

------------------
This commit was generated by Migit
2017-03-19 23:50:52 +01:00
vanhofen
02c9a3dec4 move src/timerd/doku.html to doc/timerd.html
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3eb8f8bef8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- move src/timerd/doku.html to doc/timerd.html

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

------------------
This commit was generated by Migit
2017-03-19 23:50:52 +01:00
Thilo Graf
69cc4d7a74 CProgressWindow: try to reduce effort inside progress display
Should help to reduce some timing side effects with many data amounts.
But there could still be more potential.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2de98df48f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
CProgressWindow: try to reduce effort inside progress display

Should help to reduce some timing side effects with many data amounts.
But there could still be more potential.


------------------
This commit was generated by Migit
2017-03-19 22:37:32 +01:00
Thilo Graf
8d67cc08b7 CNeutrinoFonts: reduce debug spam
In some cases with many following dynamic size changes,
it could be better to suppress this output.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 96e05c69dc
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
CNeutrinoFonts: reduce debug spam

In some cases with many following dynamic size changes,
it could be better to suppress this output.


------------------
This commit was generated by Migit
2017-03-19 22:32:15 +01:00
vanhofen
09f897e34d neutrino-cpp: fix build
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ddea13746
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- neutrino-cpp: fix build

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

------------------
This commit was generated by Migit
2017-03-19 20:39:59 +01:00
Thilo Graf
c40ccb5ff3 CColorChooser: fix missing rewrite current values to *value[selected]
Supplement to commit:
	CColorChooser: fix compile conversion warnings
	054d0c33bf


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9801c3100c
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
CColorChooser: fix missing rewrite current values to *value[selected]

Supplement to commit:
	CColorChooser: fix compile conversion warnings
	054d0c33bf


------------------
This commit was generated by Migit
2017-03-19 16:06:04 +01:00
Michael Liebmann
0afee77c57 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ca9d9c4f9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-19 (Sun, 19 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-19 08:38:15 +01:00
vanhofen
affdee82df imageinfo_ni: remove obsolete include of daemonc/remotecontrol.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: 05f695b2e6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: remove obsolete include of daemonc/remotecontrol.h

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

------------------
This commit was generated by Migit
2017-03-19 01:59:13 +01:00
vanhofen
2aa18cd5e1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/system/settings.h


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



------------------
This commit was generated by Migit
2017-03-19 01:07:17 +01:00
vanhofen
a833003150 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a75efa81a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-19 01:05:31 +01:00
vanhofen
49102e314a remove unused g_info.delivery_system
Origin commit data
------------------
Branch: ni/coolstream
Commit: 720269c99a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- remove unused g_info.delivery_system

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

------------------
This commit was generated by Migit
2017-03-19 01:04:48 +01:00
vanhofen
0385dbc30c remove unused g_info.box_Type
Origin commit data
------------------
Branch: ni/coolstream
Commit: 233886df8d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- remove unused g_info.box_Type

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

------------------
This commit was generated by Migit
2017-03-19 01:04:48 +01:00
vanhofen
9d2ce8caf1 use g_info.hw_caps->has_fan; remove old g_info.has_fan
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4f202b19d6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- use g_info.hw_caps->has_fan; remove old g_info.has_fan

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

------------------
This commit was generated by Migit
2017-03-19 01:04:48 +01:00
vanhofen
dbc883b43b neutrinoyparser: remove workaround for Neo Twin
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59adc88491
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- neutrinoyparser: remove workaround for Neo Twin

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

------------------
This commit was generated by Migit
2017-03-19 01:04:48 +01:00
vanhofen
d756900191 controlapi: use "CST" instead of "Coolstream" ...
because I don't know the current legal situation.


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

Origin message was:
------------------
- controlapi: use "CST" instead of "Coolstream" ...

because I don't know the current legal situation.


------------------
This commit was generated by Migit
2017-03-19 01:04:48 +01:00
vanhofen
2770d07bea hardware_caps: fix has_fan and add detection of Neo Twin
Origin commit data
------------------
Branch: ni/coolstream
Commit: c225c2d4b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- hardware_caps: fix has_fan and add detection of Neo Twin

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

------------------
This commit was generated by Migit
2017-03-19 01:04:48 +01:00
Jacek Jendrzej
f3b014b867 src/driver/fb_generic.cpp fix possible memleak and possible double free
Origin commit data
------------------
Branch: ni/coolstream
Commit: 66ea57d710
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-17 15:04:11 +01:00
vanhofen
42821934cd Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	src/driver/screenshot.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2fb35a8c66
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-17 (Fri, 17 Mar 2017)



------------------
This commit was generated by Migit
2017-03-17 13:16:26 +01:00
vanhofen
fd840ea4d6 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 301d4defa3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-17 (Fri, 17 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-17 13:14:50 +01:00
vanhofen
c9b8894436 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	acinclude.m4


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



------------------
This commit was generated by Migit
2017-03-17 13:14:15 +01:00
Michael Liebmann
a14300eca2 Merge branch 'master' into pu/fb-setmode
Conflicts:
 src/driver/screenshot.h
 src/driver/screenshot.cpp
 acinclude.m4


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

Origin message was:
------------------
Merge branch 'master' into pu/fb-setmode

Conflicts:
   src/driver/screenshot.h
   src/driver/screenshot.cpp
   acinclude.m4


------------------
This commit was generated by Migit
2017-03-17 12:43:25 +01:00
Michael Liebmann
160599210d Merge branch 'master' into pu/mp
Conflicts:
 src/driver/screenshot.cpp
 src/Makefile.am


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

Origin message was:
------------------
Merge branch 'master' into pu/mp

Conflicts:
   src/driver/screenshot.cpp
   src/Makefile.am


------------------
This commit was generated by Migit
2017-03-17 12:34:28 +01:00
Michael Liebmann
0c4a37ad58 CScreenShot: Remove OpenThreads and use pthread functions
Origin commit data
------------------
Branch: ni/coolstream
Commit: ad47a5d5e9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-17 12:19:51 +01:00
vanhofen
be7245daf0 configure.ac: align to tuxbox code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2d56f091b1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-17 (Fri, 17 Mar 2017)

Origin message was:
------------------
- configure.ac: align to tuxbox code

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

------------------
This commit was generated by Migit
2017-03-17 12:15:20 +01:00
vanhofen
c37d8ac675 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1337e53425
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-17 (Fri, 17 Mar 2017)



------------------
This commit was generated by Migit
2017-03-17 09:20:14 +01:00