[chromium-libs-media-freeworld: 10/35] Merge branch 'master' into f24
commit f0dc7228d27af5b9332f0f84cb5e0e73d07f0710
Merge: 77af42b 1413d68
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Sep 14 10:22:24 2016 -0400
Merge branch 'master' into f24
.gitignore | 1 +
chromium.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---