[chromium-libs-media-freeworld: 12/35] Merge branch 'master' into f24
commit eb0653c21ce24befd4c1e1429d579320a2103658
Merge: bbee19f c496d29
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Fri Sep 30 14:05:15 2016 -0400
Merge branch 'master' into f24
.gitignore | 1 +
chromium.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---