[live555/f26: 4/4] Merge branch 'master' into f26
commit 413b03773c1f357e1437908fca54adacf4adcccf
Merge: af96f6d fb6d239
Author: Alexandre Detiste <alexandre.detiste(a)gmail.com>
Date: Sun Jul 16 17:25:46 2017 +0200
Merge branch 'master' into f26
live555.spec | 8 +++++++-
sources | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
---