[chromium-freeworld: 113/148] Merge branch 'master' into f24
commit 7fc3a99820e17a98266aa374a79a8614ea53853a
Merge: eb56abd a9d450a
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Jun 12 15:14:08 2017 -0400
Merge branch 'master' into f24
.gitignore | 1 +
chromium-59.0.3071.86-dma-buf-header-hack.patch | 13 +++
chromium-59.0.3071.86-ffmpeg-stdatomic.patch | 17 +++
chromium-59.0.3071.86-gcc7.patch | 81 ++++++++++++++
chromium-59.0.3071.86-i686-ld-memory-tricks.patch | 12 +++
chromium-59.0.3071.86-nullfix.patch | 43 ++++++++
chromium-59.0.3071.86-setopaque.patch | 12 +++
chromium-59.0.3071.86-system-clang.patch | 10 ++
chromium.spec | 123 ++++++++++++++--------
clean_ffmpeg.sh | 3 +-
sources | 5 +-
11 files changed, 275 insertions(+), 45 deletions(-)
---