mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-16 01:43:35 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,527 Commits 2 Branches 9 Tags
cb7c02d2ac037a2d032760dcd6f1b2365f4cba1c
Commit Graph

12527 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vanhofen
d86625c8b2 get sure we have the logo-dir, even if it's empty 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ace914324
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-08 (Fri, 08 Sep 2017)

Origin message was:
------------------
- get sure we have the logo-dir, even if it's empty

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
4c5b3c9b81 rc_lock: use OFFSET defines 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: ce04716c74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)

Origin message was:
------------------
- rc_lock: use OFFSET defines

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
6f9f030fdb don't save conf-files to flash; use /media by default 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6649ac6438
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)

Origin message was:
------------------
- don't save conf-files to flash; use /media by default

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
dfab273050 locale: small changes; unify save/load locales 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 76fafe584d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)

Origin message was:
------------------
- locale: small changes; unify save/load locales

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
9045472f45 keybind_setup: resort items as in other menus too; 'save' before 'load' 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7be9d3a36d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)

Origin message was:
------------------
- keybind_setup: resort items as in other menus too; 'save' before 'load'

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
62783625a5 menu: always add an offset to menus; not only in round-border-mode 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: cd5fc80ebe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)

Origin message was:
------------------
- menu: always add an offset to menus; not only in round-border-mode

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
85a5591abc nhttpd: remove unused string Dbox_Hersteller 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c2fc16ea4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-06 (Wed, 06 Sep 2017)

Origin message was:
------------------
- nhttpd: remove unused string Dbox_Hersteller

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
efa592ef7d nhttpd: de-capitalize hooknames for controlapi and neutrinoyparser 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0634228f50
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-06 (Wed, 06 Sep 2017)

Origin message was:
------------------
- nhttpd: de-capitalize hooknames for controlapi and neutrinoyparser

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
fe8daf78f8 nhttpd: fix typo in LOG_FILE define 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1beb317202
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-06 (Wed, 06 Sep 2017)

Origin message was:
------------------
- nhttpd: fix typo in LOG_FILE define

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
0e1efcc5f1 nhttpd: move defines for SSL-certs after HTTPD_CONFIGDIR define 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9a1215d6d3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-06 (Wed, 06 Sep 2017)

Origin message was:
------------------
- nhttpd: move defines for SSL-certs after HTTPD_CONFIGDIR define

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
30b4c82adc nhttpd: use PORT-defines from yconfig.h instead of "hardcoded" ports 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0738d2af53
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-06 (Wed, 06 Sep 2017)

Origin message was:
------------------
- nhttpd: use PORT-defines from yconfig.h instead of "hardcoded" ports

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
ebfd3462ef yWeb: align cifs-mounts to new automount-syntax 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4097d07942
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- yWeb: align cifs-mounts to new automount-syntax

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
6aafd68925 nhttpd: fix indentations 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: aeca17ea2c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: fix indentations

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
39f1928d00 nhttpd: small re-sorts; TODO: fix $Revision$ replacements 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 01a685c1ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: small re-sorts; TODO: fix $Revision$ replacements

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
f143f95493 nhttpd: sort entrys in Makefile.am 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1a80fe4568
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: sort entrys in Makefile.am

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
40d3181656 nhttpd: remove unused mod_testhook 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: f5447b96ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: remove unused mod_testhook

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
03c1ddd963 nhttpd: just code-reformats; fix indentation 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 669bce995a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: just code-reformats; fix indentation

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
95c9ad4127 nhttpd: resort defines 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 00462eb79c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: resort defines

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
c7d18fcb7d nhttpd: remove obsolete CONFIG_SYSTEM_TUXBOX_COOLSTREAM switch 
Signed-off-by: Thilo Graf <dbt@novatux.de>

Some changes was different.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 488154ceb0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: remove obsolete CONFIG_SYSTEM_TUXBOX_COOLSTREAM switch

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

Some changes was different.


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
4e064bc8cf nhttpd: just cosmetics (remove annoying linebreaks) 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: ae23144065
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: just cosmetics (remove annoying linebreaks)

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
71d200fcd5 nhttpd: remove obsolete function to show commandline help 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: d7e34d533d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: remove obsolete function to show commandline help

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
b1abce0576 nhttpd: remove non-working and outdated Y_CONFIG_BUILD_AS_DAEMON switch 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: c507f36816
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: remove non-working and outdated Y_CONFIG_BUILD_AS_DAEMON switch

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
29f4f2518c nhttpd: align mod_sendfile.mime_types to HTTPD_SENDFILE_EXT 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 32211d85b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: align mod_sendfile.mime_types to HTTPD_SENDFILE_EXT

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
05b5ea8941 nhttpd: fix typo in AUTH_NAME_MSG 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4e658dcde1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: fix typo in AUTH_NAME_MSG

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
d14f251547 nhttpd: enable mod_sendfile.sendAll by default 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: d996147dbd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: enable mod_sendfile.sendAll by default

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
a03ad78142 y-web: show hostname as page-title 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: c06e5e114a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-01 (Fri, 01 Sep 2017)

Origin message was:
------------------
- y-web: show hostname as page-title

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
f5ce8f5842 y-web: remove white background from favicon 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5477bed480
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-01 (Fri, 01 Sep 2017)

Origin message was:
------------------
- y-web: remove white background from favicon

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
909f319a65 acinclude.m4: add missing variables substitutions 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e158e00ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-31 (Thu, 31 Aug 2017)

Origin message was:
------------------
- acinclude.m4: add missing variables substitutions

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
0a58d1e685 locale: small changes in update locales 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9112e85cd3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-29 (Tue, 29 Aug 2017)

Origin message was:
------------------
- locale: small changes in update locales

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


------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
vanhofen
d97a3de34d helpers.chh/h: add some helper functions 
Partial cherry pick from:
https://bitbucket.org/neutrino-images/ni-neutrino-hd

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 43c7e0ed09
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-11 (Thu, 11 Aug 2016)



------------------
This commit was generated by Migit
 2017-09-14 12:14:41 +02:00
Jacek Jendrzej
d232a0d8df try to fix tm thread 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 513850f915
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)


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

------------------
This commit was generated by Migit
 2017-09-14 12:09:40 +02:00
Jacek Jendrzej
aecad369c1 src/driver/screenshot.cpp avoid memory ranges overlap 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d30bd0ea26
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)


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

------------------
This commit was generated by Migit
 2017-09-14 11:17:36 +02:00
vanhofen
ada6a1280a parentallock_setup: fix compiler warning; remove easymenu leftover 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 26e8712f90
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- parentallock_setup: fix compiler warning; remove easymenu leftover

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

------------------
This commit was generated by Migit
 2017-09-13 18:44:29 +02:00
vanhofen
daafafcbf3 parentallock_setup: fix compiler warning; remove easymenu leftover 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c5645fbab
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- parentallock_setup: fix compiler warning; remove easymenu leftover

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

------------------
This commit was generated by Migit
 2017-09-13 16:35:52 +02:00
vanhofen
65bcd3ec96 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d6c4df048
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)


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

------------------
This commit was generated by Migit
 2017-09-13 16:32:10 +02:00
vanhofen
bf9a3a5097 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/mediaplayer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 626537a35b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)



------------------
This commit was generated by Migit
 2017-09-13 16:31:47 +02:00
Jacek Jendrzej
8333edc0fb Merge branch 'master' into pu/mp 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 98a31ea821
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)


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

------------------
This commit was generated by Migit
 2017-09-13 15:53:42 +02:00
vanhofen
fec79fd522 rework multimedia-menu code; cleanup from many unused code 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d23323758c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- rework multimedia-menu code; cleanup from many unused code

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

------------------
This commit was generated by Migit
 2017-09-13 15:52:19 +02:00
vanhofen
5de0c243cc Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Branch: ni/coolstream
Commit: a0f93d9281
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)


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

------------------
This commit was generated by Migit
 2017-09-13 15:07:03 +02:00
vanhofen
612837a196 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/cam_menu.cpp
	src/gui/info_menue.cpp
	src/gui/mediaplayer.cpp
	src/gui/network_setup.cpp
	src/gui/record_setup.cpp
	src/gui/settings_manager.cpp
	src/gui/update_menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d5f5578ef
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)



------------------
This commit was generated by Migit
 2017-09-13 15:05:33 +02:00
vanhofen
46e5e5e202 rework multimedia-menu code; cleanup from many unused code 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 56cdb2dd6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- rework multimedia-menu code; cleanup from many unused code

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

------------------
This commit was generated by Migit
 2017-09-13 14:46:38 +02:00
Jacek Jendrzej
113f930317 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Branch: ni/coolstream
Commit: a5bc9f1050
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)


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

------------------
This commit was generated by Migit
 2017-09-13 14:09:21 +02:00
Jacek Jendrzej
f55d2b44a6 fix pick diff error 
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7813a885d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)


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

------------------
This commit was generated by Migit
 2017-09-13 14:08:29 +02:00
Jacek Jendrzej
35227f219c Merge branch 'master' into pu/mp 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4e232439c3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)


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

------------------
This commit was generated by Migit
 2017-09-13 13:52:49 +02:00
vanhofen
30105a0b3f remove unused nkplay stuff 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1fae4130b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove unused nkplay stuff

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

------------------
This commit was generated by Migit
 2017-09-13 13:48:16 +02:00
Jacek Jendrzej
bea20473aa Merge branch 'master' into pu/mp 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c5bf73006
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)


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

------------------
This commit was generated by Migit
 2017-09-13 13:40:40 +02:00
vanhofen
73b2025641 remove unused nkplay stuff 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 932a535b6a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove unused nkplay stuff

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

------------------
This commit was generated by Migit
 2017-09-13 13:35:23 +02:00
vanhofen
9b9e405f04 drop easymenu 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 816de89898
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu

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

------------------
This commit was generated by Migit
 2017-09-13 13:35:23 +02:00
vanhofen
fadeac1d43 remove unused nkplay stuff 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 93c8768fbf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove unused nkplay stuff

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

------------------
This commit was generated by Migit
 2017-09-13 13:09:34 +02:00
vanhofen
b6b296939a Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: bf366676b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)



------------------
This commit was generated by Migit
 2017-09-13 12:52:23 +02:00