Merge branch 'development' into LTS_development

Browse source

# Conflicts:
#	src/output/output.cpp
#	src/output/output_rtmp.cpp

...

This commit is contained in:

Thulinma 2017-09-29 16:21:50 +02:00

parent 485a4ecbbe 178c888e56

commit 4b360c8164

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

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available