Merge remote-tracking branch 'tuxbox/master'

Browse Source

* needs compile fixes
* needs additional tests, of course :-)

...

This commit is contained in:

Stefan Seyfried

2016-10-22 11:37:40 +02:00

parent 4cb5245546 9a9fc2097b

commit 13ab1ebc8a

346 changed files with 13372 additions and 6088 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

1765

src/nhttpd/tuxboxapi/controlapi.cpp

File diff suppressed because it is too large Load Diff