Skip to content
Snippets Groups Projects
Commit c8e55670 authored by Lukas Rotheneder's avatar Lukas Rotheneder
Browse files

Merge branch 'develop' into fix_bitrate_conversion

# Conflicts:
#	utils/sdf_conversions.cpp
parents a20dfdf9 370e8368
No related branches found
No related tags found
1 merge request!82Fix string bitrate to unit and value conversion
Showing
with 6313 additions and 8 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment