From f0646f81aa1c4ba5cdada749ca1a18bf60b14dc1 Mon Sep 17 00:00:00 2001 From: Miguel Solorio Date: Mon, 20 Jul 2020 22:43:42 -0700 Subject: [PATCH] Update Codicons: add 'merge' --- .../browser/ui/codicons/codicon/codicon.ttf | Bin 60816 -> 61024 bytes src/vs/base/common/codicons.ts | 1 + 2 files changed, 1 insertion(+) diff --git a/src/vs/base/browser/ui/codicons/codicon/codicon.ttf b/src/vs/base/browser/ui/codicons/codicon/codicon.ttf index 733d36ca30d34e24de15f8044970f25772218f05..82acc8995b8d7ee0338bc65547844f5f99b953ce 100644 GIT binary patch delta 2982 zcmYM$eN>b86$kL|O+t7Tc_%PLATb~W5CVjk@D>6BBBCe;MFat*2+CULth1(eJ?L?s zjyASu=d{Oqwso!A?zqLdu5+$+*4nOf&bF&oJ6YG-_W7x!PP?vM?e4?##ZeDmb> zJo(*wf0?{&oVsG1wEDLKv=2bnz*ztI^zOjdfcXm`zGK7a{p;61`_?5O?QP)Xj^UyH z!IX!e>E+i>v9e))AoSgk`F#Hbvki}J+4k8%z6bgc2uT>-JkWp0eQ7(8+6)->jrDIE zH}v5QKX2g|Wo+sn8_GPCTE7dp+`%u17~g!~meC|nE%1I15Nmw>fL2q<WO!(h-KmMdgEIm!nP4(p;P*w(e1=)uqwUjP(_UBY>PVn6)H(1GKET6xhqCwzzQJ)a zqLiv}8~?>u7=az<(2vLQ0`e&nU5F+(wqO8P@d|#66O@NZJb*nkkD@U|b19UPD1pK# znbIkR;;@%y(YJ!lz6zX)w9>hN7Fk7^0eh5{ z+=138YtdDHey8ACfaVum70@0OdjDv<1my(|L>2ny@!5pnih;IUK)=jAg64AW6%@+( z13^ig+|fEp;QXPWFwRLq$()Z0O6Pn`Pzq-N$kh*AmeBSK=wI}>pjn(x2rk;KvpUUO zv{0FX%NL4&dL0)slvQv^L)iouHxyr^j>{a%F1X;KvIUnuRF1&QoIGiC+zwE=f*S)W z5Af>;?hz=5;BJA+7u+{c1%f*Ws!(t*K`jv6RZvBO`wOaAaHl~z1@|0OiQw*o;u_I$ zANrxn_=IswLb(JtCseuMHifDX+^|rUf?F4=N^lcHxdpc~6c?V38yl)dV2ZO=aI-_z z>A0x4@1g1iPXH*7;8_6GAb2W3c?Hi0s7Aq)0;);y%z#=bczQrJ3!WoTErKTsRIA|G z0_9)C2gYLts!i~~fm$qh^gy)>9zswZg2xfmQo(}>YMI~>1=T5dSV1ipJhq@#2;AlD z5`N#!ia56ja&mr0klqbj+04HPZUyySL3%fA z6Qp;;{esFlw+pJ|{GK4a19k|~EBygMdZq6aRL7}bC?mbl9~8ueo}_m12_wDI9}>I` zby>boa{}-2u{hA1QZ?@sKXX9f2Itd)GB^(koDG~zN%nuvXFn0VIYIqY;8o6N1aDYS zKNGxlK|L#Y6N7qAK)=XCf;Tp(!-BUss3QW$px;hW9B;8bw1b|YqrukHZt~wQwiS;Q zA1%J+bU4>J_dDMxi7WAxoG;BObCiviJ?FBx9&%kP&nX`)f3tk5BB`RU;$X#zitCjz zmHR6%R*hC&bbH)Kt8LYT)%&Wi*F@K()lAop*6y!Ms~fM=>V5UU^hA3+o}Hc#8rm9; zHQe-Cyp`VV-m~6Yjk%4(jTih)NliUXHy8FUywaT0{PX7Nmg1HJEn4eH>m#j47oBQD zTUuLl+u^ozi%pB$+fD5S?c?n)woffdSmIu?y`!#UXUDOnSbA#d&1E~6o#-s-?CU(R zJZpL1^25ugSCp^VyW&`vsmsyT+qJ#x%1ZajTfP!slh5ZH@$K+k>n`Y?=(fJJDrVJ> zR%xpA(vrt!ZG3S zlEEAv7M*J;wAd}ai14_W-2B|Eh)8O9J~F~G+Z;3BksBKq9?_j_w;0Y$OyoC~*QHT> zylq~Bts=EJ#pTI!xg2@6%yef#VaePq+dA*vn~_mj_Bcy^fipeRW-oHN@;v1{34*u% iuk=u3@c5NI27{p~SaWqvm^ox@=-v%O!6!ey6Y@VPR~m`{ delta 2793 zcmYM#X;hTw6$kMD9biEAxI+vjjN*n1jItx!peQ&&c5y^0vP4B`g4VRg!Pb*nnnQ>~ z{E!b#laNY0r{^TWB-Ut4TB@ccDYZ7*xRj>Wn)lJxq%lnmt^L2=59RQC|MSj1?{n{c z#xDo;T?*=R`F8>GG=SRXj;7AnPk+$`I6nub6t!)CqIGk4Z#^(;1UNO)-qN%sZcpd) zeC{}o{*gt^pyj+jllM9ofB$?;W2BIC?so_H;Tn;WQtg z$tNZ5XzFNr_|^Er{lG^D`GoM!osV~YzwOEe;Br3@`_;22UHKk}{f5A6FLpL;ipjl$ zh@czxXIx63_R0VA-rb;ELH2nV9QM8Z<7>ndNRZd%=+KzV4hekeoZ@!ee>*rP5On`m z3NsuCcJP0UFN(hZ22Sgs^|W=yde3;x(ZGsOxBnXci~~3?593$(FWwXfmP;=FiLY=M zTak?S(S+yl6D*QM)FN7P(1m7P#V}6b9a(@rJc)xcTcXe+3F4G#GDSjVx;!K^fkF}#JhaU4J8mbo%d=F37!kwvmt zmdH{`6Spjr<&rKLk|o)aCo3dh3Zzhqq!W2`XXk`$>mvx zVpYJ}p;#ZVb}HNrj7GTR{lM*r97znMM7ks=P!Z`$y~@Y;Db@=tzhdRU>Q;D%xnIeG zz(C}ZsM$PwN=Z~;JaUFVfoDBRoXj66nZ{%j+GGmz86~02J|)wc&nkI{c}UrfY6TSQ z6c+o^2K#fKQ^Kom9p=!m4-!ALH>%3XT7}`2w6SVok`(I~#-&)vF#HuZ)-=og+U_M|Z>icJEuNU>dD7ArOm%o4>Gf?+|~ z*i0~~ifsjxrr2OGZpBuES*F-@Fv}I&&kvK%6JjUAWGMC|3`e1j-3gPW*rzbriX97+ zqu9GJtSlS57$#4#pJ7%gb~a4DVvoZV*jPercbG!O#)m0V904%Jio*cLqc|2|N)!hK z%u2;k0kcYRXuy;zjt`jCih~4Zjp9gw@t5&HoGvisigN~Lt>VOi@hZ+9mG*9P9~Tt#Tf-ttvIbc0Fk6(wFaAgpv&Ax0GZtzpcdXhP_Jcs((_6UG@8vae=R>Gp6Zuawp#IE}9C@Bv3W`0*@1;%+y4Qz?a@xRMQeyDJh`GVqZ1M?$=Gt3ti zHz1go6t^OnmlZc9m;r?m<|~RD70iznw=9?=iklbAAdqMuVE@)v6?Zh4qsrdfhDzhN ziT`X`bXs-V;j}Tg)1B$w;eN|~eOcGC(dA?5vFYXMCo_^WdNM{c!!kQF4`iOm3eNIm zZO-b;I+mT8y*DQ|XK&8+-0Ix3d0}}=^ZN4M$QxeKpC6l_nLk`GwV=0PqOi8`jl%0i zNkvZ;-7c;#K2&_N_^Kztv)yyp^Fc{u$?lR9{*_pHXq97C_o~s-%F_PQ4_6nh?p+hT zCT&f1S!>xq*>Ks-a&P%#<%8v)tsPu@&O6oX^B(XX_l`f3@W{1_q>B2Afpx9x4pk;q zZmzso6l@d*jy2>q^frua2;0!U;h4|qOYv3s`g|iBS8i-?ENJX+{FoQ&{H)aGp;O(%KJg6g TyK>Mm6gIvwY-rn!J0brAmfrVd diff --git a/src/vs/base/common/codicons.ts b/src/vs/base/common/codicons.ts index 3f3177206e3..36696e4a455 100644 --- a/src/vs/base/common/codicons.ts +++ b/src/vs/base/common/codicons.ts @@ -476,6 +476,7 @@ export namespace Codicon { export const debugAltSmall = new Codicon('debug-alt-small', { character: '\\eba8' }); export const vmConnect = new Codicon('vm-connect', { character: '\\eba9' }); export const cloud = new Codicon('cloud', { character: '\\ebaa' }); + export const merge = new Codicon('merge', { character: '\\ebab' }); } -- GitLab