Merge remote-tracking branch 'origin/master' into master-cmake

Browse Source

Conflicts:
	components/raop/raop.c
	components/raop/rtp.c

...

This commit is contained in:

Sebastien

2020-03-10 10:52:18 -04:00

parent 38645af1a9 d713830e72

commit 804c67ef9a

13 changed files with 950 additions and 897 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

components/raop/rtp.c

+807 -806

File diff suppressed because it is too large Load Diff