[chromium-freeworld: 8/32] Merge branch 'master' into f26
commit 699efa46c6c23ba560889330311af324708bfa54
Merge: a2f0a87 41a8870
Author: Tomas Popela <tpopela(a)redhat.com>
Date: Fri Dec 15 09:46:25 2017 +0100
Merge branch 'master' into f26
.gitignore | 1 +
chromium-63.0.3289.84-aarch64-glibc-2.26.90.patch | 12 ++++++++++++
chromium.spec | 17 +++++++++++------
clean_ffmpeg.sh | 8 +++++++-
sources | 2 +-
5 files changed, 32 insertions(+), 8 deletions(-)
---