Merge branch 'development' into LTS_development

Browse source

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

...

This commit is contained in:

Thulinma 2017-03-16 17:20:12 +01:00

parent 746d982d28 eef9303e61

commit c7034fee86

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