Merge branch 'development' into LTS_development

Browse source

# Conflicts:
#	src/output/output_progressive_mp4.cpp
#	src/output/output_progressive_mp4.h

...

This commit is contained in:

Thulinma 2016-11-23 12:52:00 +01:00

parent 046d89d50c 7df7c04aff

commit 5bf6052d5d

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