[chromium-freeworld/f28: 5/6] Merge branch 'master' into f28
commit da3defff5242defbbde05958d93b175144130634
Merge: ca74787 89cdd01
Author: Akarshan Biswas <hellbanger(a)ga-lmt-s2.biswasab.org>
Date: Tue Oct 9 21:59:25 2018 +0530
Merge branch 'master' into f28
.gitignore | 2 ++
sources | 22 ++++++++++++++++++++++
2 files changed, 24 insertions(+)
---
diff --cc sources
index 7d1e885,8f1cf20..063da26
--- a/sources
+++ b/sources
@@@ -1,1 -1,19 +1,23 @@@
++<<<<<<< HEAD
+1779724693bdcf7b4e01ea1133abdde2 chromium-69.0.3497.100.tar.xz
++=======
+ da72b7ad3a595d0140ceba60e867b9b7 Ahem.ttf
+ 288115b66e98afcc694dd6ec2896cea4 Arimo-Bold.ttf
+ ccaa8e13109cd38413b2932985d5eed8 Arimo-BoldItalic.ttf
+ f47f3969c349f68100eff6d6a60c801c Arimo-Italic.ttf
+ 0b354bcd98dc591b886fdc253ed89cbd Arimo-Regular.ttf
+ 1779724693bdcf7b4e01ea1133abdde2 chromium-69.0.3497.100.tar.xz
+ 826ffce6a2b7dc7775b6f5e21412797b Cousine-Bold.ttf
+ 80b219719676bdcfda35f722300f2456 Cousine-BoldItalic.ttf
+ 337a3d621d7b6d940b8dd1ba9430dd87 Cousine-Italic.ttf
+ 8c49cb0b03881a5f4178edc0fbe8567a Cousine-Regular.ttf
+ 49a7f897775cce21d2b69968b8af1cea depot_tools.git-master.tar.gz
+ 4d610887ff4d445cbc639aae7828d139 gelasio.zip
+ 85d8bf52bda23c1cd422be54dee113a6 lohit-gurmukhi-ttf-2.91.2.tar.gz
+ 314394b29c1d15a73c3f00316003810a MuktiNarrow-0.94.tar.bz2
+ 9af8a0b80e85db34b1c34928d81cc423 NotoSansCJKjp-hinted.zip
+ 7ac1d29dc1aea67dc8607fc6d403442c Tinos-Bold.ttf
+ 02b895625ab1d641cc25eb3261b172d4 Tinos-BoldItalic.ttf
+ 012412bb679844077b2eb100d59f3a0f Tinos-Italic.ttf
+ c7b726b40d858a1f39e848b9b52a64a1 Tinos-Regular.ttf
++>>>>>>> master