[chromium-freeworld: 56/148] Merge branch 'master' into f24
commit 840da84ee8223c4359d0b2557a7009c072abd2b7
Merge: 65b9550 95a4b60
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Nov 2 11:50:14 2016 -0400
Merge branch 'master' into f24
.gitignore | 1 +
chromium-54.0.2840.59-i686-ld-memory-tricks.patch | 3 +--
chromium.spec | 10 +++++++++-
master_preferences | 7 +++----
sources | 2 +-
5 files changed, 15 insertions(+), 8 deletions(-)
---