Skip to content
Snippets Groups Projects
Commit 06543722 authored by Frank Bossen's avatar Frank Bossen
Browse files

Merge branch 'master' into 'syntax-trace-fix' 

# Conflicts:
#   source/Lib/DecoderLib/VLCReader.cpp
#   source/Lib/EncoderLib/VLCWriter.cpp
parents de9a0669 8a821a87
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment