[chromium-freeworld: 17/148] Merge branch 'master' into f24
commit 084ba5491f5158ab63c08c9b2e034b0c2b8d7de6
Merge: a5504ee 8a15fdf
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 8 13:38:46 2016 -0400
Merge branch 'master' into f24
.gitignore | 1 +
chromium-52.0.2743.82-arm-icu-fix.patch | 12 ++
chromium-52.0.2743.82-arm-webrtc.patch | 51 ++++++++
chromium-52.0.2743.82-master-prefs-path.patch | 15 +++
chromium-52.0.2743.82-more-codec-aliases.patch | 15 +++
chromium-52.0.2743.82-sandbox-pie.patch | 15 +++
chromium.spec | 158 ++++++++++++++++++++++++-
master_preferences | 18 +++
sources | 4 +-
9 files changed, 282 insertions(+), 7 deletions(-)
---