Merge branch 'cst-next' into nmp-cst-next

Browse Source

- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



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

...

This commit is contained in:

Michael Liebmann

2016-08-19 17:40:48 +02:00

parent 3daad4c6d5 59d3c49084

commit 2c4ccf9555

260 changed files with 8682 additions and 4001 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

1634

src/nhttpd/tuxboxapi/controlapi.cpp

File diff suppressed because it is too large Load Diff