From 2a9ba56cdc47a2435d16b29311bdf7666f49e209 Mon Sep 17 00:00:00 2001 From: Qwerasd Date: Thu, 14 Aug 2025 13:21:41 -0600 Subject: [PATCH] deps: update z2d to 0.7.1 tagged release This release contains performance and memory use improvements. Some of the sprite font test renders had to be updated due to very minor differences in the anti-aliasing, since the default anti-aliasing method in z2d has been changed to MSAA rather than SSAA. --- build.zig.zon | 4 ++-- build.zig.zon.json | 6 +++--- build.zig.zon.nix | 6 +++--- build.zig.zon.txt | 2 +- flatpak/zig-packages.json | 6 +++--- .../testdata/U+1FB00...U+1FBFF-12x24+3.png | Bin 5718 -> 5724 bytes .../testdata/U+1FB00...U+1FBFF-18x36+4.png | Bin 9974 -> 9975 bytes .../testdata/U+1FB00...U+1FBFF-9x17+1.png | Bin 4334 -> 4341 bytes .../testdata/U+E000...U+E0FF-12x24+3.png | Bin 1252 -> 1255 bytes .../testdata/U+E000...U+E0FF-18x36+4.png | Bin 2220 -> 2217 bytes 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build.zig.zon b/build.zig.zon index 55a693496..d7e3bb300 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -20,8 +20,8 @@ }, .z2d = .{ // vancluever/z2d - .url = "https://github.com/vancluever/z2d/archive/8bbd035f4101f02b1d27947def0d7da3215df7fe.tar.gz", - .hash = "z2d-0.7.0-j5P_Hg_DDACq-2H2Zh7rAq6_TXWdQzv7JAUfnrdeDosg", + .url = "https://github.com/vancluever/z2d/archive/refs/tags/v0.7.1.tar.gz", + .hash = "z2d-0.7.1-j5P_HhFQDQC6T5srG235r_nQpCrNwI15Gu2zqVrtUxN5", .lazy = true, }, .zig_objc = .{ diff --git a/build.zig.zon.json b/build.zig.zon.json index 24f1053ba..2ed4f63ce 100644 --- a/build.zig.zon.json +++ b/build.zig.zon.json @@ -129,10 +129,10 @@ "url": "https://deps.files.ghostty.org/wuffs-122037b39d577ec2db3fd7b2130e7b69ef6cc1807d68607a7c232c958315d381b5cd.tar.gz", "hash": "sha256-nkzSCr6W5sTG7enDBXEIhgEm574uLD41UVR2wlC+HBM=" }, - "z2d-0.7.0-j5P_Hg_DDACq-2H2Zh7rAq6_TXWdQzv7JAUfnrdeDosg": { + "z2d-0.7.1-j5P_HhFQDQC6T5srG235r_nQpCrNwI15Gu2zqVrtUxN5": { "name": "z2d", - "url": "https://github.com/vancluever/z2d/archive/8bbd035f4101f02b1d27947def0d7da3215df7fe.tar.gz", - "hash": "sha256-wfadegeixcbgxRzRtf6M2H34CTuvDM22XVIhuufFBG4=" + "url": "https://github.com/vancluever/z2d/archive/refs/tags/v0.7.1.tar.gz", + "hash": "sha256-6ZqgrO/bcjgnuQcfq89VYptUUodsErM8Fz6nwBZhTJs=" }, "zf-0.10.3-OIRy8aiIAACLrBllz0zjxaH0aOe5oNm3KtEMyCntST-9": { "name": "zf", diff --git a/build.zig.zon.nix b/build.zig.zon.nix index 380bafaeb..b1b19be37 100644 --- a/build.zig.zon.nix +++ b/build.zig.zon.nix @@ -290,11 +290,11 @@ in }; } { - name = "z2d-0.7.0-j5P_Hg_DDACq-2H2Zh7rAq6_TXWdQzv7JAUfnrdeDosg"; + name = "z2d-0.7.1-j5P_HhFQDQC6T5srG235r_nQpCrNwI15Gu2zqVrtUxN5"; path = fetchZigArtifact { name = "z2d"; - url = "https://github.com/vancluever/z2d/archive/8bbd035f4101f02b1d27947def0d7da3215df7fe.tar.gz"; - hash = "sha256-wfadegeixcbgxRzRtf6M2H34CTuvDM22XVIhuufFBG4="; + url = "https://github.com/vancluever/z2d/archive/refs/tags/v0.7.1.tar.gz"; + hash = "sha256-6ZqgrO/bcjgnuQcfq89VYptUUodsErM8Fz6nwBZhTJs="; }; } { diff --git a/build.zig.zon.txt b/build.zig.zon.txt index 14bb0e8df..849c679fc 100644 --- a/build.zig.zon.txt +++ b/build.zig.zon.txt @@ -32,4 +32,4 @@ https://github.com/mbadolato/iTerm2-Color-Schemes/archive/3cbeca99efa10beba24b0e https://github.com/mitchellh/libxev/archive/7f803181b158a10fec8619f793e3b4df515566cb.tar.gz https://github.com/mitchellh/zig-objc/archive/c9e917a4e15a983b672ca779c7985d738a2d517c.tar.gz https://github.com/natecraddock/zf/archive/7aacbe6d155d64d15937ca95ca6c014905eb531f.tar.gz -https://github.com/vancluever/z2d/archive/8bbd035f4101f02b1d27947def0d7da3215df7fe.tar.gz +https://github.com/vancluever/z2d/archive/refs/tags/v0.7.1.tar.gz diff --git a/flatpak/zig-packages.json b/flatpak/zig-packages.json index d50371f5f..a67ccef59 100644 --- a/flatpak/zig-packages.json +++ b/flatpak/zig-packages.json @@ -157,9 +157,9 @@ }, { "type": "archive", - "url": "https://github.com/vancluever/z2d/archive/8bbd035f4101f02b1d27947def0d7da3215df7fe.tar.gz", - "dest": "vendor/p/z2d-0.7.0-j5P_Hg_DDACq-2H2Zh7rAq6_TXWdQzv7JAUfnrdeDosg", - "sha256": "c1f69d7a07a2c5c6e0c51cd1b5fe8cd87df8093baf0ccdb65d5221bae7c5046e" + "url": "https://github.com/vancluever/z2d/archive/refs/tags/v0.7.1.tar.gz", + "dest": "vendor/p/z2d-0.7.1-j5P_HhFQDQC6T5srG235r_nQpCrNwI15Gu2zqVrtUxN5", + "sha256": "e99aa0acefdb723827b9071fabcf55629b5452876c12b33c173ea7c016614c9b" }, { "type": "archive", diff --git a/src/font/sprite/testdata/U+1FB00...U+1FBFF-12x24+3.png b/src/font/sprite/testdata/U+1FB00...U+1FBFF-12x24+3.png index 2eff59c76114698bf12ffc228db36a935a03c16e..1a4dcb01ff0fa66a0e34ddbcba8fff27e76b5f09 100644 GIT binary patch delta 1115 zcmcbnb4O=_3ZwEyRWU)s!v;L9?k73qRFz9u`Y!~UG+jR-CV9|7EMei2P7T{m|6QUl zem5Li=kd3;wem&l|2OWFD+OiiI}{vQIF&pE9Gf_VTqYseS1`IOj$NeBk7Jp|Y`3+chJmNzJ-daY6n2z4=@1VwBt;E8SZ<+v(X_k%bFb ze9O3;qw3$+{{2g^3n(wgaQ#= zH!V`>YWrqfZ1=Ta9WDFJd9`6SUzKp-7MC?XA<=_9`dWrTWa1#3bfYG zRM|1bB;iSq+qyQnEAFvIkt=H6MG3T)XKLsbZ)jmopTwonY`vy`TFFL_pLez@aJ|13 z8S~75Q$^a)Lv8byz)NLf8uR-jCRD2$ot%8a%&B16?TI?IKaS}qI5~?wiCcB{lggcr zZ*zXOnfc2971zFKFTYu#{`sepSs8}|+aCDzy9j+vZ1-mrmfEcF{8#O)jMIk=PR^8F zwe*#9pFXpiNrvMxy_)4}eZh^!meYK%x!2hwIV~1TIj57l{F>|u=JcWs{#Q1X#R-;Z zT8c!R_+0Dgrp=YPB2`|8H}U53McOYJ(u1UuvLdY4bNo`0>3=!@wW~A#`+8X^G4V>z zjrv?l={kDnR&CsX00M{q{l9zOeCkyXuVCgW9yOWnT2H6n44AU)yv}_8?2i?f-sj$) zcYXc(*TuK@sVdlT@>3YlY3r@1H6@SH`H_d~&9H(hugUtz!J?fB#i#ez7R{ zv2wee{)MMY17`l+7nS|7zTnpTr{Dh8)ZKsfGsW`t)|_b18S(S4Jv!L_>#v|+wL5Dm z>m{b9Q&P^pA|^fmgZ-;Lmp|FbG;^|QuGg`^v$qvmmes9uSax^W%qp4EpV#kQ+VUWz z@eQlBwys6PqyM2R|D5s@J>mEB)2Akbm}3$Js~pOFt}#_HFf(18QG4Sh(_iMv)uP8m ZKD%TUWfZdiVPIfj@O1TaS?83{1OUfh8zKMz delta 1114 zcmcbkb4_Q03Zv{sRWU(>BMJho-ZzC}PEDI26eFa1;aJ&5)rebcYDyE29%!yC=$`W3 zbE0nB!{^;L?R(GI|DHU#P*AJ9A8d<_-*$3aH(C|e9w*tYWh#UF7G)0_h)pw_T6;?A>sAk z-~M-ho7(q@`M4oxn@MnGoSF6Y z2diqv#$bs{+UBcpZqOf1@;P0n`(#pMcJfEx$-Patb5Mpb&_kDt=G3)n2@BbbDo@*wo z*thaieZb#2_gg}^i|&aWb5uR^c-lX~pMOLQj;npX!+z;V^}OWsA7)R;bG+o6_+(W| z-P^1Ctpra#p7!rz_0#1YmL67p%l6;;GTHSDNX>_*I~`(Nlmu!kkId|fIKZ0a>&*AV z_rwMTj^A1iR!3ianW)2I^!(uTFBjb&FL*nR)$zu3Pow(ji`dRs7AuQ8>%UUgo2fBn z+iWqG#8|0Q(=E5P7@tefR@ieVwRVZGc-NA*%UB&FuAlpq+LzDdsC3M1a^NqH+hrmi zx1)7V>=BZDGuc7P(c*B4ikJMHAC^8VPBxwK-g?olQ+<(X`kV`GFO~l%X}zB^=pR)N}X8rA;1AnZlKC{P5eOI3Ig@-GPONG^9YG|BkK!ADOvUy(w{7zQ0 z2B~}BnDRw=_I9U^*}wKOtt^vHdsX-3X?zvecGm4&OZ0C9-frUd_!d9)()u@HjbC)* z@9aCkJK2zbN2r3WS{CEp2DZk8GnQ}48vikaQ|%2$E+$7Fmy5sWPo5yUL&Wz+R@0hU ST7C=+3=E#GelF{r5}E+5SspI{ diff --git a/src/font/sprite/testdata/U+1FB00...U+1FBFF-18x36+4.png b/src/font/sprite/testdata/U+1FB00...U+1FBFF-18x36+4.png index b77f7dfae74ed67f1b9ca3ef40d4bd09f0142509..73ead485dacbb6d9ea2e3fd5d527d069730ecfe2 100644 GIT binary patch delta 867 zcmez7``vef3gfv=k;p1N>=C8VY_rBfqI8-MudKK&AoKGk1kDBFpywVk%HBo`vO!&x> ztR{w>ZpH~!9BLYR;mIkfAE$BndQRZgDvS|Zc;sc#Q^O0X9|d9_?drANRWHlF^o-{O z-YlUV8x_2^KCtFlu~DMw|H0h4O=6c>m-={3;O#Zv{_Ms#$J03m2d>#z-8!@lO(Zcg_34UMuJb~Vqf|I@O+fNSn0O-G^PZ5nqTG_GZib5H0_61ATi z`Skp&DSn)j7HmHGoQ?lj&14A?wfkCiT)VH!U)5YIlp-GR`D#dhyf+Wm>>5e?y2M9K z9ACXA#5$Y}5B{$=yE^~qqLWT_Z%$og70jBZu)AT_x@CFOkFK6$@L_e7_s`Cdpmwj! zX$tjFiKnY&3^$za>;7q&yab8&Umg}Q!ZCKvsCH+WS%@txu~A!jGLsQa>bFJM}jt9 zZWol-mu_I1IM+ixlw#_;mv4}UdB?_V#zpFc@_jnJ1}p{ouAZaAItFlF*o&4nI{ zi$dgu1Vwo-CQGJiJg;e}vsk#SL!r!m{e;)f`~Lmi&T7LHb)J#&Z-JAqpyQkW6X!ph zbMLCWM#KT-1y5xJF7T^gsTY}e{TiMY-GNL}@lkcskHU9rZQ1Qu%kkUQk!jaP%iw6c*_wYgTd1yL a6p`6u@?X+<{&NNf1_n=8KbLh*2~7YtG?rih delta 866 zcmezF`^|TP3gh05s)dU62Xl`a@Ho4_@TlJ+_kZK!lA}zlQb#!DUDdl*XFolp@X^(E z%Fd*^NBl3Yw^pyVuc_I8z@gSVKY#a|3eoP{)3Od)%&z(5zmZpZQk8d0n#zf$vn+-y zXDKk;PGVRh*TmU%`l>`^+0 z`?bMRsvHW>8CUWrZ_JaTXe?DC9&J=t#eZdC(6=%agPD$yoWqWp#Yx9SyKKYtGCb~|4g+$7( zZT(qQ*HhXd%l7BR>5U)0%GjT(I5fRU@9CF&6IkNB|1nISrd(7naN12$QMtmU|B;}L zm)nKMd&Ak|71GteKjab=kt*;PI`ox&dtJQ#K6wT4HHW_J3N^VAIN@~4*^^?r!9EkY z6t=drEb!`(J00L``#kwYyO39xL6UL9CAm{y-|shlAQ)iBo&pv9-}k5F`ImM792}YD z7;~RD@ca#M@)WH1dy~K3(ew1AfA>8r)KX{gakoB8e%UVMl~s^*eed_p-REcbrruzC z0x~3PLsGT-wz?RmqA$*zs;U(mUw>R1kn{Hk%aiBrLS9-uNAh+unMU_7_ha1ob79M* z^V%JACm#^L%bT(2@8dJ3e^?IXs6X4CHK(EE&yj;)3{LQuB{BsWeG+E-EbLkLPDE8f z*FLdeP3rN4@ZEt-v*M%bq;9P*bA3_Xd@SKxcN0rVa`CdQHDfK|LxhY z5IiwH|DFB{<^AilSKi5G(fswgxKn4@+w~KqOt*aD-R99F$x;7Xk+(%7X2MyP$ERjY zD=L4^=`@9Tr4h`TmP29h@QE0~R_4Vg^)m`Qqx=k+^U^XvWbq z+Xa?nKiih2n>q97o=yoPF!;w&qaJwf+vYUx9SvD2V*3T?(^*zH(ZX>30tUmn};W(d(jJ?!rk+1Ud~u>$#d<_ zD%A5)a9g-*+PBz?)rZFFYj>#xm-}0gj;7VQog=^X7MOt2;6aD)8w6nGzx5I=Z z++Lo(qoxw}BK)Nn_tHDtzTUPivk2BIy!&35^`~da($=soIZ85_84C9!gR;WX{Y0K@ zu3r@%CE>y?Y3F*=xSOjt@^)!v(;fETUff<=M9daNv}mSfHs>!nu;SIE1wCMpf2hMf ze*TYB^XwYD|DDt4$v0fW`Ka*1OXZ-+Qk`pi-b4h=N}l-Yr}LX95tXS2U;Bj5T3p@9 zeVu1gxv_Tg&j&5f42t#@398iY-)VExMCxQczuPv2_s7@AT;)t-G0>M$KT&3(_9J=u zzBz^y72}t2JVVzYgA#V_^|}lU?rI{PlC{TARf_ynXTIbmoozP3!0Q zpJMlB`x__M{Cu*XbMzaQ+Q%%G5}O+q*FE!pDEy@ML*KtYeS z0gk&5HaXsG=$XJ);G2v+PN+*HjZx_zrQ|?QXGvsAYYmb@lA(*N#hVFZbBkK3#wM!zWRjR#KoWf8)<%=AUgBx7~jw70SAt+i0?S z>arcHYv!?VO+Rs~x3GWHzKJjY7S1W>Pc7_a?Av?&Z;RTIn5VL-4!rf9hZv%NE3?=C zGWA$5_d@vY%EUimF^~5LnZ!qwN-ETMM*U|=k-4Y3yY-Oc5tTpMrMcd@4$HnT)9+(6 zl{s8(P+sy=UF^6(xZAV7`C3!GmInP@@FwK+skJBhrv*NWm6|DB%qrxw^7`(ht+TfW zC>)&fu}pt1Q|e=_ir^isevO+7|B77j+2zWtT7Q4F!)Z3JIUXfkQ+i*2pa1m3Ugg&g zjdijbh58p2*L%+Y`@SIrWI@$}C!N>t_8w&Z)b?kQM1alT*R}c*Z$2Eed&Sw1qIrR- zaYseo^56xZ9E_Jb@H0=^eP>eRGd?eGHlrtZ)fsoWa&0M5P+`^LpYqm_RY5evGS+YD zuAu)644WUaH?!35op{?uAe8;bBYgqy07h{c>j~BgoLY|W9Hv_buqScu;yQC$b_Gl9 zy9YLx7`tnKGkmOjBYEkbdGh@Rrj7YKSvGLo`y~9I>-UA^JE`)w?#$rln&~uqpX6mb zk7T1{7LOaKbz%qqJav28#d=vv{Z_0?_`{IZA1_Yinl3W; zcSZi>kaQ(`=FWpBUrlguR4@D1IDnq5$o}1ct_GX-7XUe2AX@&(; z7^UiCO?ub5wkEl2R#;DT&8<^e9J=V+ye#*s4YFCGpPJvLwrFIm;XL4LzG3m9X@4WX z+&}UnxBrUm);??L2?*xJW6LBH zrhN~rSGc}3QvI^k(tC5JTrSv{plr@!x%?WB0YAI=F@9l-d2`%Wd})`7y7aK4-?!!R zsX0?tEb5q3)xbDsN)PvYo9X}R8rbHto+NPjJAi5?s@or<+KNJ z=U*fne_Xwjp?m-NeMcYqZnr-?tEcwcW$w2d_kKC@$S3#^i)`Hg*Vk9xSuj)WX}w`m z(B_qqPqba;-Lz+PtbfX+ob4sPK+eeX2rKVv#TPPQhIRXb z)pIaBK;d>T;dp?*>6#R_L7zq4LbR`rH26j{-p@o|n4-xI|x@(wmFEM=AA ztc`l-rK0aYUHLXpzAjMU#o^wx1MRDoS3J#J!QFIV;-r-U2Ru3joH!I);KX9FpNwl6 XB>gx1v@>I1U|{fc^>bP0l+XkKl|GC- delta 2980 zcmeyW_)c+x3ggy^s^{vxHn4baVDa|g)I2Dp13`^K8jbl$EZ_X}7Nx{Z%D*wwd~z-O z6SF_E>`&jbE57&I{a@`(%KNp!ETWFC0fHs26DIjCS?N-=R4!0mSkheOalJx@+Wor! zwT|1=?%(^jZ^68p-7A+C*(-Zo&W{(_G-aE;lhl<97vncLC%yHkzagHf;PSXBCtV`^ znqNpjgoNGuZ`@3A_Gw=IQm?waGB|$A@lH8#r~XfICbQzJHCx^OHYv=|I$zI!O7N^s z*-uW#Wr=yO&rR%$eAC^rZ~+KB=s(~ulvQ|pmi7bYRh^NC94nqo`@SRfV}ij&W7(GF zPi)TJcxGx*Zr*q0Ops~)ycgTKcUf-Vd;i)2&+4rftz*=IyFqWUi2= z{=)U0Kg+e9lP^>|GBp=|YRZY=y0J2#>&bT2gS+p}aFDuI9$LDXIkIJj{+vsGl3Tw^ z^-E?pRaxyWaN5|qWYzO4AKQN(vMyEe43OXR?I-)BrPYca!j79g%xXQWvNW#Uvb7Xh zaxnY*<2UEteiVyZl&A2DBlBm{4<_3$tLhJ0)xJ8ojn&8^KjG};Xo-n;I;>(|UG12r zoDrYX>)({(y%on1X) z+uHOEK9|njNmU7Zv94q(tLpZ*f4<3A&(Ykv;~oFZrb8;bE;*@3nF%JoU({IhzQbtE zxk;KD^(mq2w-|JZ8P#Z+8g%#dMqV$iZ2HqyyOdQoN=rO&%^{P`B^TqD99r>e(t;*1 z@ITZQ9{>JEs(<`})c2pY4~O$qHdV-!{OY>$%q_{^%}>Yj>_(5Te^krL*8EAi_}nLa z*5dR|?(;mG{EhvOeL5(4Ht|W#Q$>$|mBoLbT*|0dv7d3HsYY)9rx5j7f(P~#%u=}i zaK;1wxxb2zxwQS6p*3x@Waz8~f?7X${+~Hswx;#ToM{>!HSe~aUzL0F4U6N9Z}Xg& z&NC5zf9=bf#R?uZ6Ly@gR@DPc~WELOpAnV{kEFd6)mNzlvdD50tE z{g1tDvcg}!uQymC{xo_=-5;*S;H=U8k)MI#|Nl30dP^S}@EqUkSTCt4J%x7`?=9X_ zY^lx3%o2@)yAGx{Z(@{Gl>QO-XQIb6k@g4MD%=0PziaKoa!KE?Q0H`QOMQlp>*6(< zyBMw?aFg}P&bT(={DQd|iO(`F#&q3WeT=C$cuJD@649J32fy%~Eqh|D!6@}SVJGh- z9f1=kr$ikwOMh{kHD4>^n$g4h2M-FL8+vZMpdv6QQdG;>U^d^6mu7$K)ibuGA9CC} z{oj#=b6ymx39PBm3FSyS!}!ax;>g7_%F7-ecr)R(u;wBjmdTawDI0f$sB8YYxkcg9 zI-@lHo&Ilry8gEOox;QQwz+y$fBXkNsr6TSg4fM>#hL!*4Bxkw&4#)xt0ENkT>4y} z7x-`We*I1d4Ns$f_2_qQUC;G4WapP}NS{||@mTPR{k|YO!58|MPiTct$hh?Bn3UTs z69J7r9~KUN>y#9shIJY359PCtY6ly=TItC6YWCASah4ati~M|C6)(JQ$a;8a;diC9 zNkOSyRf|KC z{bXDz*>|Eo@<9Be53ekq9eFt^va#l{@#XDj%~BnD)!Yg`+MC_~k+d)U%7^G$x6p$x zo6bD(oT>RvD_*Vfkm{zg>^qCsX`s-s2y{&dA38>pW_BWa`A7kC%Hb4O$s;U&H$9rlRam&8br=rn@~m64S^M{OW67 z;lpRTA|3{*d+vHKceuHO>z>H83z`9D>)tcX^4y-a;7PS;#@%{{PT@|!#!ZEP|7@1o zSDqrPaiO1C^_{BK6VsQQ|I1DQo4;S9@=n5y{E9Fia{Zg zYm1YD-n^$JTp@B9%S2vWZ+N1&J#E3x=1a30c`Cms<#k;4sW9M7L}t zj2L(i|KG5*%{kcJ!lbkXlM>-zVQREo7@+xKv&Xab`625fDxw~{?CyS{H8;!D&T9Fg z(ynv0`?f1yl{|gkA*o=Kl}f;cjdS-VU7Dz{=I7krYn`8L*Jmxhy7SUT%iG$1N}iJ< z1)0+&7hH6$-@S3`iV1HuSo4o>T5(q2C`vW!{mQZu{%y`{yKG*}b3f5^Y!<_v5@u_y zoJZ#u{XgiIU%lkr%F;VG8&rfh^LjQ+ef0d-o8wF^il@pdOwQ&O#&uncmdj-~)xR7t zfnQJT^}RSrgS1+`^P8of+;Tk^a_ORE#?|0$&WjnhUtQ1}))7~qcDUj6g@8#9Z#V3i zA-J+Ptor?Sza4QY3RgDCO7ZTUQ0TyBRmLjr_E&Sy!H(*!^FHo=yKGk5EN6q=3r;o7(>%bCcHRBY$LyZQMUJcc z<9Qf`lp_8waAH}L+SM5Oe~$h3I9|nu-3^ZVhKv6m%nxr+k@P&&#!xPum{6`!Uy!IH znsmS}SAF7<9_GhFT-I@QGZoqmT2)Hy7D&vHVT!5PY(K;E=4_RRkB*#MS|b*+;i9>O zR`O*YgVVoP*iU%9EAsf|SwZ>pr|f=MbkOa7f`{K)$pkq*y&ieB0vo&D9hc;5G8P`5 zXm4gYC+yjhCt6(}R&|x6qLjm4?^~(ZM!6Ca)IfJEtf}qVL_lq2|ipon0W*<`0Y;}*kaJkkYG31}3e%IN_y(fhK&CB9^ z_qE5)OnCn+?hQYG%S6w)XYyb2TFRTv^W!r5|6CI8-mJqZTvGLSef;vG=CoN;j(2d@ zd+9q?rM#FV==k*b7Q1h`{T5f2dSCeXt@nTVrLU*Uk03$8>Y8f8Co!+|f-w z)fW>UEyb`e{b8=)7(26FP&VFJJ9^zj1SH*e!OBU7^=ydYkVS z7vH<~Y34}=$M4G&o=c0RX5Tf`4DYb%u4ig`#p+gnZHl6UZOWt$?pfEIFIa*ZWqgj| zmXlp#E^JvH6WHE$YT>I1ev8~MM7F!knKpGrsPuX#%>e$3k1btgPB>@SH&k$NzWJob z#S}Zwblbku!M7LN{aK`Np^s|!GKgToKVa^Y37N$lA1py8)wSjq=^-bYF`zOjYybWXZ-!(IM*MciQ-1Y=` z+)Hr!WB2c1sT_Nmr~5sLW0kJjlTsXyoR#bI`hQEH-!SP|(o>y!m6L0hUYYU1Nzp<3 z=L(}h$C4)p4CXRxx%!x;p7=6Z`C(qxycUO}QBl3ztqd2v{%U@%x@3L&MBj7nRtKA; z%bJRv?9()@c#i0#T+>>SsKxT<aAd>{OBQ<*4Fu(M`GLwB1Qz8JoYA_TC$- zK1XDxRCqRiJMk;w@y^7Bt{g5uDj|y2J1Hz{^EjFIbbob@ijk-H`-#1;K8G%LnRsN% z@-H!LN@7OYqLHE^Om)grC#+PiFI*}k=@HadVEby0g|*?a$#YLT9C4~oTl=Xvoaw~T zP)?5>{awebjkFrwRNI?Hl--%9%sKCH(2J@J=f-K%dq zOg*~q^!1wV>zi*oOg-N!XD?zawyN&I)?W|a6s~@_F`%^jLe}X^57VwDFZ`vp`RcOm zhs)ZJJAE~CUA@h-p4Yg)Ri<}cSnu|KQS0QmEu)sMjoNFVdQ&MBb@0KVdosQ>@~ delta 891 zcmaFP`Gj+V3ghaHsw|B4cPDN(;Mv0$#I$rr%ajK~8c)3zuy_@4PI2JWbi9AyY0lq> zh?qZTe>hrC7GJ3Fev?_mxA})37FfvewS%cX=E9wm_a6CgK1sN6f9SzU>z-ZF<1iI# z;BNiFTV$5=+Ge7+(Whf3>!mX$9^htr^Q*w+*LA*vK0&TY(_ZOD?aSh$=UKFlBY#?$u*|cP7{53rv;ty`v3h#V9LX3c1qUQp09T0 zRNkQ3|8gczi_Vg3t2V9D5P8|_;_~si{9LjFt(oDIHC1Q)Ys?r zdMppRR|^Of&S&i{PZ47}>%_;b>BPrwU^%<7tMy9MsWS;eE^a=4jz?-mzucP`%CRME z`JRhTot!Q^Zt{faEV-uTye~k*C~2xHSK<8^Qzt0T7RV45$=SkXDxz?uhwYSDQ1(K@ z)m*M_Yrailp60BdX?ZneajVd3*O`*MQ*@VHtCtE|z;~pI)ApIjYXj3YR@;}on$TU+ zfAnh3f@4YcPqOzNe|IZJrJwy4cecLr zjqrQ9-+N|1sh`_dEAYL)FS|-sKJ-KF`v)I>`+ZB_QTpKf^f~*NTf>qWIJM3Az|X+& z|NomiXL*|qc-SuFO%SwFQZ8X}d&?1``9zH6YO>~KtV%&w^QC- zvnOGvPTwn6ZdrbJA!Dn}cDW8w%HLbHGGS;6bf{Ho$jO;?yNm&nn!>kA4#GV$Jg zS$^1Mn$ae)`?=}ArcB)W<6X>dhj<@>8Qo$pip014ShrTYzR{=e9oL{=D^AAmj;$^?NjqAg9Y0MVv zN?Ov8!YNs!eOw~SA?J(_1GmF!5#{ zw!9*}rF7Y>-t$UQFV@Q&YDo&Kd|17==&5tl#~1sq9**VFy)nT}y?xh#%iD$PFU~ol zV&ivzf{O5MG+F!BNI05&dNQ> zdhJwW%G!(1|NOmcCCNE0AgG4(EZaR^W5P}LJj9DJ0v|D zqt>)dDuf9$P`%=o2f<#J4tT&-__=@jxm66S0c_YyNDp>`kiTe)7{+ zcS8Sp`KwHt8{S=+WwGk&CdJ97g2k4%?)*My8Pjw2)aI=ZjbC1q`#=BIU;9rJ`(>uo zGcYjx|NrJNBPRm`L&N5aY!et24S7NA1^?E*eZVWt#DD}ouz*y*ofs%0)}a6N{xVnD Row8jZc~4hAmvv4FO#p-~yHEfC delta 970 zcmZ1}xJGb-3S;p`RRiYwhZBtzIrj3cYnf7@8gXjchNUr_nu@9sho%)Q{c%=x=b8hD z8KnQF&H3>9*#(C8jfPs+{i_{0Q+)&u8U{ElXyMs6buo{w#^$F_POa|U`Dy009@Fr* zYRrpf?O9ekPjJ;Vl|4!U63VP9-X|VJTb{VUWF+mo_AZmnoO4}mAA%d6`FyVzPg_$G zXr?T3)PwP)kkOB@KEo{yXWE22<5vXjGmD6o=6SL3<_~@j>xfw@ds2)AoLN=8KxQ2Q zndQH@PqBEuWX8D?x$7whx3KH#ND3b@;1Qjmq1c?Sdt#o^77piEDz7B^G`M@WsoXJb z;1ZAV5c1f;&zZQUp@LJgCR?rkt8klGrpMev6aG2QFOS{Y@vPlCP0h>(08sI8EF@&r|JAs71rp@O3RG4CL-^&)PD1 zA*<11}kUZ1bN z$gaLe`nC_PVg@k6i>ELghrT1-fjp4MT*3;$FMt?QKz-mWcD zcb@jqq$Zg|Lh{l5d#4QU_KAhBGQIWjk8iVOea9j<-A(n(Z_4K1**PJ_hWEY&i(1>1 zyP?_MdK<#{RI+>Ro_~LT?WD(smPwDK8{T;?G7VPju8`Wt$-~3LS=S|@bj0IA``iWF z<_2)4zL9o%_b^C7cv8pmhqu?Td}YfEQS#Y+5{&AFwMFZ?}iJ&#R(-Psds zZoheV`+i2f*qtN$=Fb1pp2cEwpZ`RH(3QejbprlXSA-qUm$L|;YK%SO?o})|Z5l(( zIp;GTTvw88r_BAl>!F_Qdd5GJ4o9oj8a{2k>ueRbWT$XL_s67yQ`+x6I4jpL;uo9n zGpqKPyYfV#BKv0&UoBFPrH6yq?NVR&WFKnpo+$LmUPGq-t3%PD<@-ULld@lrRO~zc zd7==PO_uyukNSPzCVOzQ-g0u=x^o3@%*iw7C$p`qR@i>vw|PO~ifYra-Yk*J(F*(H zFEjnD{a+ozz2v~I;Os{$!cMpOTyr_|G^6;v_VWTmGwt)&+RiVDuKrV>^}YUd^u3~h ze~b(a|Np-^%*e?wc{ii@=0|Kbj1z;T3?FcU#NQq^u(o75>a6tUI V>@rpPysjb;&(qb