[chromium-freeworld/f27: 17/37] Merge branch 'master' into f27
commit e4f98e1be442bffd5cc8659d0c882da0f5068507
Merge: cae1f49 c747d58
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Mar 21 16:44:03 2018 -0400
Merge branch 'master' into f27
.gitignore | 1 +
chromium-65.0.3325.162-epel7-stdc++.patch | 12 ++++++++++++
chromium.spec | 32 ++++++++++++++++++++++++++-----
sources | 2 +-
4 files changed, 41 insertions(+), 6 deletions(-)
---