[chromium-freeworld: 93/148] Merge branch 'master' into f24
commit 66f8a0a8db2906ceaf6bdc1567c220a62fe387f5
Merge: 97d2e2b 6d6dc41
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Mar 21 20:14:36 2017 -0400
Merge branch 'master' into f24
.gitignore | 1 +
chromium-56.0.2924.87-enable-mp3.patch | 54 +++++++
chromium-56.0.2924.87-gcc7.patch | 82 +++++++++++
chromium-56.0.2924.87-unique-ptr-fix.patch | 12 ++
chromium-57.0.2987.110-enable-mp3.patch | 101 ++++++++++++++
chromium-browser.desktop | 217 +++++++++++++++++++++++++++++
chromium.spec | 45 ++++--
clean_ffmpeg.sh | 74 ++++++++++
sources | 2 +-
9 files changed, 578 insertions(+), 10 deletions(-)
---