From 6f318bcf7dc7a4865c9432acc586325537b879b7 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Mon, 2 Sep 2019 15:15:34 -0500
Subject: [PATCH] merge new Software icons from master

---
 .../src/components/softwareCloud/SoftwareIcon.tsx |  12 +++++++++---
 .../softwareCloud/imgs/35-Shadowsocks.png         | Bin 0 -> 583 bytes
 .../softwareCloud/imgs/36-ShadowsocksR.png        | Bin 0 -> 693 bytes
 .../softwareCloud/imgs/37-Shadowrocket.png        | Bin 0 -> 633 bytes
 .../src/components/softwareCloud/imgs/index.ts    |   8 +++++++-
 5 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 src/FilterLists.Web/src/components/softwareCloud/imgs/35-Shadowsocks.png
 create mode 100644 src/FilterLists.Web/src/components/softwareCloud/imgs/36-ShadowsocksR.png
 create mode 100644 src/FilterLists.Web/src/components/softwareCloud/imgs/37-Shadowrocket.png

diff --git a/src/FilterLists.Web/src/components/softwareCloud/SoftwareIcon.tsx b/src/FilterLists.Web/src/components/softwareCloud/SoftwareIcon.tsx
index b1618bf98..d8a397863 100644
--- a/src/FilterLists.Web/src/components/softwareCloud/SoftwareIcon.tsx
+++ b/src/FilterLists.Web/src/components/softwareCloud/SoftwareIcon.tsx
@@ -33,7 +33,10 @@ import {
     img31,
     img32,
     img33,
-    img34
+    img34,
+    img35,
+    img36,
+    img37
 } from './imgs';
 
 interface Props {
@@ -87,5 +90,8 @@ const icons: { [id: number]: Icon; } = {
     31: { image: img31, imageTitle: "AdGuard Home" },
     32: { image: img32, imageTitle: "AdNauseam" },
     33: { image: img33, imageTitle: "Legacy Unix derivatives" },
-    34: { image: img34, imageTitle: "Windows command line" }
-};
+    34: { image: img34, imageTitle: "Windows command line" },
+    35: { image: img35, imageTitle: "Shadowsocks" },
+    36: { image: img36, imageTitle: "ShadowsocksR" },
+    37: { image: img37, imageTitle: "Shadowrocket" }
+};
\ No newline at end of file
diff --git a/src/FilterLists.Web/src/components/softwareCloud/imgs/35-Shadowsocks.png b/src/FilterLists.Web/src/components/softwareCloud/imgs/35-Shadowsocks.png
new file mode 100644
index 0000000000000000000000000000000000000000..62cc490d44fbbd4c07635680fe1206addc5d3c80
GIT binary patch
literal 583
zcmV-N0=WH&P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0o+MMK~y+Tt&=}U
z96=PuHw04zErS1U=Jcu{K~zK$AzGwR(pcDtMbe0c5VRD;ow)%UD-o=;3M3*%QG!GS
zg?+nsrV&XRZBnHYs}L(SiJsr;)7y1VJ-vMJVE3E%e(%l9uJu19N2!q?3sYP>tx~&d
zLOI0N!xYnQi_o+RSjG>b-7#LepM>$6grXHdPA_2$?BtaEBn>r6MW3an5a>LV`?uUs
zF{j?HxJflg?JWUz1;RAHg>nzGK-%K;n^k3~4uy+B5W~L1TMl`OCb%rBm`T;*us>lN
zC&40)4^lhtuKNIXb9q+6&<jB3&^-b|!5=gkl(zR06CQ=uu>;hWF~&daR1M5oEdC26
zasad^bgB)oYFx;EBuCLMqX0`%AG#k$lCqIbjCw+t?WX{L%dze^oMzmGD$Uo5nC%Rp
z)4G5Cf#j*?ne8GglX-+2T?qK05J~S1qoR@{8>PZ_`eoAVWy_MvF}XmOAxt{KsduY%
zc(VjYGLPvGa={QkIrV<3H9Jr6r*z;*CUIsz0>F=)lAo%STaVA=Jtpk3dKMnD?SJ&o
zMUsYuc3!iUpM*{A{v_D;7q$vh+@@E6{i-&blC8po?RLf#z2(=!l^9Py<HtN?S!W~Q
VWwUZ+|Fi%A002ovPDHLkV1grS{}=!O

literal 0
HcmV?d00001

diff --git a/src/FilterLists.Web/src/components/softwareCloud/imgs/36-ShadowsocksR.png b/src/FilterLists.Web/src/components/softwareCloud/imgs/36-ShadowsocksR.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e0e2e76f5ccf97e72c85dcff024d25836271360
GIT binary patch
literal 693
zcmV;m0!safP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0!m3lK~y+Tt&>Y=
z)KC<LBR&?Q3#rz*ciJvRiq<qz1r=17E`%bw&{@<j#DyTPgn~3TbEP8VLJ>u3XXDtJ
zQM5%-@kPblWTtMUC_>%3kWvIe>Z-nvC+TUE7@Zj(KO8vsJic=uiS|Fm`;<=ZzbR?i
zo4MsYWWrVy`a2~or-NDQKEl8=W;y+o`ZF=<8ce9W2>Ct-BVZ?$)F&>L&V{<oEfoRz
zCY&#;q*_L$)s>XxHg35$5jGFP-Aps#%mhI7jLLtnCaKn8<471puooD+6^RLTmfGS<
z$Z{)Q_6<D7w{R0#fm`;GpW_JJL+yc>RBI7(4X4LI*zg&L9Ob6F1$X!{lE)KZ?@GdW
zmt9_i!4f9FMheLgG{vm)R)jU<gS?H^2=$6k2+OF0IQ>(sD6mRPpUapWUy9)8zsP$7
z2MIT;)$(a$!n6<Lq*3qrL&X<1=EfIm01NO%hePp*v5ebIsJQs?#|_N15AlqfrjW*k
zEyIA_r}9wA?T7MU8XgVwz?*#PB$d`yL+{vfyprp<`ww%#bT$W2G{8L54+H0qO?y6+
zj4o=aPpxud3H~W5ypnT0r!P)=koFUIpgVi%fe$Pid#SX#nuN0+Ka)J}uuI!FywHom
zRXycFrY`S%J#%H#J17_<esMiwrrPEm6OVn5Li0cv+F(Ml{R#S`l&Y<ysdgajeX|_n
z6bgWawnixFyL`W>cTl>z@VK1`p$^c}7YqeJe_b$M;!g8^vX)x1l@;Vh1Zw*ta(#bx
bt!Y01v5}{Q%d9Fr00000NkvXXu0mjfw`MoO

literal 0
HcmV?d00001

diff --git a/src/FilterLists.Web/src/components/softwareCloud/imgs/37-Shadowrocket.png b/src/FilterLists.Web/src/components/softwareCloud/imgs/37-Shadowrocket.png
new file mode 100644
index 0000000000000000000000000000000000000000..816f0fd51777a4ce6ea2b73b4b32c2de84d82299
GIT binary patch
literal 633
zcmV-<0*3vGP)<h;3K|Lk000e1NJLTq000aC000yS1^@s6x$xW(00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0uD(;K~y+Tg^$Z?
z6Hye#$Jb85jVu2G-HC486<jE_(2WHVwBVysA$Flr6Eu@z>!wOljgpzRlxY=AEK;XY
zQ%wT_ZEI1}Mg_6f$ENgVGMSrsWdf5P=W!*iH1P)m=X~e;xZhA4aX4MN*gS<jWNid&
zYJOP^d1e&onpNOv65k<*jcH5Z4*#?QhPeurDnMXHg=2j2Bss6Aby(VYW&&f$ScSh}
zYd)Kh1n;=8gV<`Ej!E9}FJ;I0T{hu|Vmk9POKXpb=ZLLF=fmQ3QLDn_q5<I#8uZPn
zkXkZ8w6yc1B2R2C9nAY}!MLQ^W!UF3m{xy9ufo6!*?HyWn1qPc<w68)k50J9g=`u4
zM;M-R7(V9=M;l7YK+~|5*eNQ+$$Lf;ZosA_m>?J2f3S&7D(eIOp2F_Od@b-VV^+=H
zUU`>ewvwCs?+UZBY!$CVsZ@n<xR7=N{XHwKnb#^g)hCluAw&yJR3wn^%f8WIalwGM
zNd<m>tq=>q?{5{DORMn9(muV@A#x*si;7-dxz73!&-hS~^`lc<x1i)Q8rUBf%wxuv
zKW^!_*=s1pUP0YXt+fnYTHecDM&S`J3fVJ}>(dsGZ)r(ly5$uP5UDZkPozVmIUTrp
z9ZtmYej?YWYfwCxo-e~xRtL|Zw2#P*dBBL-`;7RJtp6uUqa*kH%LmB128#LvDT>9D
T7~`tB00000NkvXXu0mjfG(sO`

literal 0
HcmV?d00001

diff --git a/src/FilterLists.Web/src/components/softwareCloud/imgs/index.ts b/src/FilterLists.Web/src/components/softwareCloud/imgs/index.ts
index ecb632bbf..6d65459c3 100644
--- a/src/FilterLists.Web/src/components/softwareCloud/imgs/index.ts
+++ b/src/FilterLists.Web/src/components/softwareCloud/imgs/index.ts
@@ -31,6 +31,9 @@ import img31 from './31-AdGuard-Home.png';
 import img32 from './32-AdNauseam.png';
 import img33 from './33-Legacy-Unix-Derivatives.png';
 import img34 from './34-Windows-command-line.png';
+import img35 from './35-Shadowsocks.png';
+import img36 from './36-ShadowsocksR.png';
+import img37 from './37-Shadowrocket.png';
 
 export {
     img01,
@@ -65,5 +68,8 @@ export {
     img31,
     img32,
     img33,
-    img34
+    img34,
+    img35,
+    img36,
+    img37
 };
\ No newline at end of file