Merge remote-tracking branch 'uncool/cst-next'

Browse Source

This need buildfixes and some functional updates...


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



------------------
This commit was generated by Migit

...

This commit is contained in:

Stefan Seyfried

2015-12-13 17:41:55 +01:00

parent 61712bcdf2 151d7f25a4

commit 5f89c9a312

320 changed files with 21291 additions and 13199 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

3162

src/nhttpd/tuxboxapi/controlapi.cpp Normal file

File diff suppressed because it is too large Load Diff