Merge branch 'development' into LTS_development

Browse source

# Conflicts:
#	src/output/output_progressive_mp4.cpp

...

This commit is contained in:

Thulinma 2016-11-23 15:38:08 +01:00

parent 5bf6052d5d ccb932105a

commit 85a868beee

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