Merge branch 'develop' into fix/theora-detection-read-bytes
authorrinpatch <rinpatch@sdf.org>
Sun, 2 Dec 2018 21:34:04 +0000 (00:34 +0300)
committerrinpatch <rinpatch@sdf.org>
Sun, 2 Dec 2018 21:34:04 +0000 (00:34 +0300)
commit343b0adfa6c88f0934d788be0e59ea8a5fe483b1
treea6debba90a247854543aad4069f1b2e3d9ebd1b1
parenta3953ca37ab4122772119ae345705e712e23dd17
parent371d96b1da85960dafea9665b8bc32ba553b1555
Merge branch 'develop' into fix/theora-detection-read-bytes