From 3583fc3fc73f10c804d9cb3a6e86504258f561df Mon Sep 17 00:00:00 2001 From: Jim Norman Date: Fri, 18 Nov 2005 21:20:53 +0000 Subject: [PATCH] Windows Fix: Statically link msvcr71 into micasa.dll and micasacache.dll. --- LoginCapture/LoginCapture.ncb | Bin 117760 -> 117760 bytes LoginCapture/LoginCapture.suo | Bin 12800 -> 12800 bytes c_adlib/Novell.CASA.A-D.csproj | 54 +++-- c_gui/CASAManager.csproj | 66 +++--- c_micasacache/link.w32 | 13 +- c_micasad/micasad.csproj | 4 +- c_micasadk/link.w32 | 16 +- c_test/sdk_sshtst/sshtst.ncb | Bin 175104 -> 175104 bytes c_test/sdk_sshtst/sshtst.suo | Bin 13312 -> 13312 bytes shsrc/wshsrc/mk-micasacache-ow | 2 +- shsrc/wshsrc/mk-micasadk-ow | 2 +- vs_solutions/CASAInstall/CASA.ncb | Bin 207872 -> 207872 bytes vs_solutions/CASAInstall/CASA.suo | Bin 27648 -> 25600 bytes vs_solutions/CASAInstall/CASA.vdproj | 50 +++-- vs_solutions/CASAManager/CASAManager.suo | Bin 25088 -> 25600 bytes vs_solutions/miCASA-msm/miCASA-msm.vdproj | 255 +++++++++++++++------- vs_solutions/micasad/micasad.suo | Bin 13312 -> 13312 bytes 17 files changed, 288 insertions(+), 174 deletions(-) diff --git a/LoginCapture/LoginCapture.ncb b/LoginCapture/LoginCapture.ncb index 3f155518fe937977a5fb711e6e202ba00132aa35..93bc9493655aa16cd1c320fb054013f1a9a2b780 100644 GIT binary patch delta 1749 zcmXw4U2KzO6h7zsT2?kzCYr63A#JB+1KCfVr2DUkTiMpN`{_0mH$p<3L~!GROhZf+ z#6gr)M>sVRGmRlj3}#xSGl~v^(ycKWUXW?TEa=59)HNE&VjT0S-|NLm&-a{jp7Wgd zJ$W06Wkq6H(Ms-5@NrJ*Z<|cnMC6;-S4h7Xzt6O&k1l6rWuK}5`VXz>OaEc<<(!-~ zoEKkhyKa%$i~M{1vh#_3mUBoVn$zNz<4alDI(#!_Qy#^$-?+P0x4S8>zq_oTFJ#jP zAFg>TRFWuh@L%S5;iX@PF8O%LT;ZMggN|$>VwAecN;$QdXX9xjZMxq@i8tJr=QE%FYSIVuEC(8fL0Wt_ILBbVz#}H$CjF zPLp3nLh$K9W5C+Xd3y}z0lAFS`Ut}18;r0M;p;_2CNz!#_m&x{6Y#?TGaI`WXLMeP zOIFK{AeXM6N4!wcF2Uca>hk1d5Sv?Elcvk6#3wg`IGSF$6Xbr+AR>NMI0F9yI%JyM zk9`?bBxAtOs97d!<8_7)&`?^vwSTCo$*yR~P z+@;=xG59M=#3cMfig*_O8CADXFSon68aur)j0LkvAj}21j0dSSa^PmP+L foB8R{ZO% delta 1674 zcmZuxYfKzv6uoz5mxTq{tG1I0$oXN=?&Ufzp z&fISn|Cq%;W;vG2Z2=zOOY(@xWIeovi2k8f*{?;JZpzAv#bSlhzbLN~{kx`VE8*c0 zfzS`x7ot_93`u#rV5kJDfNEd|PzUS=o(En4_5d#edx3hOK`}dB+^D#nsk~FEbUv2m zgt{JZ0~>)fARX8MxPS~GQ+wa}+`f^;Qmu60bIVAr+1%CGN)F9>hU*<1uL{aejvV?Y-&ha_^U1&{?QeC@3=lMK;u%?x@>e@Fn$&>tD*!{kFn&nx( zA+#r}YIWbYbb&AMJ3_0ke_Ci8taO#8d77t$NHXchYc#_%?0aBMQ=0R3JY?=9i91NL z9U@8Y2Jay$>=it_NHS?x^0K9oOt zak+6nimuT_Gj}x?4t!lcwAEGHUCl{O@-VcS+xKc6So|Ad(3KSbQhMAFiL)aFd#fn3$gi410*X-G-E-KhE#xOXEOOqAa6H)A8 zDKS0ZjpjCv4iWXZT9JJm-~F3;>iHOce7HJ7Ju%95sOp(fP7%*bqwEz=i^^WHUa9gx zie63BjNiu`UOGFH=%o0KtX=9&l@H?!BKjhPXqVby=a}IdlX_x|GbfTc*{c5hE+-F{ zC94T1Iahj5`naTA&Dr!crS zFY)3v;2&XdVsD^^zeRp4CGG_yKQH&+Kh<{=S7H{^VyxV zC`yd-W$=S|Rnaz;BI(D6b+f%FNQaEVjG~}=6os-6WICVoZFN{ZV{~YTXz{YsH3V_5 zQ*ZSwTD@+Rk3+w1B%Fk~+RJhBJV>*b%Wc15bt}$ZB&6b?I)zqpJjhSNmIZPLimjqJ zNK;0`28gZ#*m^;B7I40N3}jG{(;#zLN}7RR_2^-26hYOG=vyqnuqq69sqo(FZq6EF-KAw4i0-Nw$G8W`3aRW0DFMm#@wo3Y&(_;I7~ zEDC=?XZa#XY9Z#i2vS|hajs?9;&Y72mjub1tnV8k_BC2%lmyi`3Q_I@`AU@6f!ry? g9NIyWir5)8gxc+*PoTV;r+A`{$IXH9*SMkTKQr@nWdHyG diff --git a/LoginCapture/LoginCapture.suo b/LoginCapture/LoginCapture.suo index 5b860f540f67247af797d6cc68a751cc19734e45..f9cbc760db304c4fe50c93edf05d66ea117cf24f 100644 GIT binary patch delta 354 zcmZojX-L_S!@~AKAo6e0o5@8ifxHZ&3=9k`K>QyFCJS*&C4hR6yb!4USv_3 z?7+h^xq>x-gC9w7^B2|t79Mt>2osX%WCuZ@QZ64JMxY=Yvcwmz3p|2Q0kCyIgExQS z4q)N|@tBd7mhkyccIG#n{Dm)MvWJ$=~~$O|BF>#mgW9WC|lGnp`3dG#capF=Wv%;olLa|6CjVgZ<^}UOV4@dUR3E*~CtpdcHv#22m$Jd8jAAtb@gU$_I9csPL~ z%t)e>OZfaDc5@+%e&Gw5e1cDBatXixWM?tM&0qNanZS$^A%8}QdOjreo4*MAGx0L= z0EPIGgjpqloTSN>VyAc+S%6G2B)Q2Y;$WjEe-WR>5Ar||Ln=cK5GOJePo67L!^pf@ fN>Y;@Wa;D*1*lR5e_lpmpjsv*gEp5a_6Ps~&C-OI diff --git a/c_adlib/Novell.CASA.A-D.csproj b/c_adlib/Novell.CASA.A-D.csproj index e0ac1635..78b174d6 100644 --- a/c_adlib/Novell.CASA.A-D.csproj +++ b/c_adlib/Novell.CASA.A-D.csproj @@ -79,24 +79,6 @@ AssemblyName = "System.Xml" HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll" /> - - - + + + + + + diff --git a/c_gui/CASAManager.csproj b/c_gui/CASAManager.csproj index e6cab4e5..d706975f 100644 --- a/c_gui/CASAManager.csproj +++ b/c_gui/CASAManager.csproj @@ -94,36 +94,6 @@ Project = "{57CD94A2-5B4A-40C3-8189-CB760FB78357}" Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" /> - - - - - - + + + + + + diff --git a/c_micasacache/link.w32 b/c_micasacache/link.w32 index 55e6c807..6eb30820 100644 --- a/c_micasacache/link.w32 +++ b/c_micasacache/link.w32 @@ -1,17 +1,13 @@ LINK_DEF_BLD = \ echo "$(addprefix $(OBJDIR),$(notdir $(OBJS)))" > $(LINKDEF);\ - echo "$(MSC)lib/kernel32.lib" >> $(LINKDEF);\ - echo "$(MSC)lib/msvcrt.lib" >> $(LINKDEF);\ - echo "$(MSC)lib/advapi32.lib" >> $(LINKDEF);\ - echo "$(MSC)lib/ole32.lib" >> $(LINKDEF);\ echo "/LIBPATH:$(MSC)lib" >> $(LINKDEF);\ + echo "kernel32.lib" >> $(LINKDEF);\ + echo "advapi32.lib" >> $(LINKDEF);\ + echo "ole32.lib" >> $(LINKDEF);\ echo "/DLL" >> $(LINKDEF);\ - echo "/PDBTYPE:con" >> $(LINKDEF);\ echo "/OUT:$(BINDIR)$(basename $(notdir $@)).dll" >> $(LINKDEF);\ echo "/MAP:$(BINDIR)$(basename $(notdir $@)).map" >> $(LINKDEF);\ echo "/PDB:$(BINDIR)$(basename $(notdir $@)).pdb" >> $(LINKDEF);\ - echo "/DEBUG" >> $(LINKDEF);\ - echo "/DEBUGTYPE:BOTH" >> $(LINKDEF);\ echo "/MACHINE:IX86" >> $(LINKDEF);\ echo "/SUBSYSTEM:WINDOWS" >> $(LINKDEF);\ echo "/INCREMENTAL:NO" >> $(LINKDEF);\ @@ -25,9 +21,8 @@ LINK_DEF_BLD = \ echo "/NODEFAULTLIB:wininet" >> $(LINKDEF);\ echo "/NODEFAULTLIB:uuid" >> $(LINKDEF);\ echo "/NODEFAULTLIB:user32" >> $(LINKDEF);\ - echo "/NODEFAULTLIB:libcmt" >> $(LINKDEF);\ echo "/NODEFAULTLIB:libcmtd" >> $(LINKDEF);\ - echo "/WARN:3" >> $(LINKDEF);\ + echo "/NODEFAULTLIB:msvcr71.lib" >> $(LINKDEF);\ echo "/OPT:REF" >> $(LINKDEF);\ echo "/EXPORT:sscs_CacheRemoveSecretStore">> $(LINKDEF);\ echo "/EXPORT:sscs_CacheEnumerateKeychainIDs">> $(LINKDEF);\ diff --git a/c_micasad/micasad.csproj b/c_micasad/micasad.csproj index a77dd058..e9ddd470 100644 --- a/c_micasad/micasad.csproj +++ b/c_micasad/micasad.csproj @@ -300,7 +300,7 @@ /> $(LINKDEF);\ echo "/LIBPATH:$(MSC)lib" >> $(LINKDEF);\ - echo "/LIBPATH:$(MSC)platformsdk/lib" >> $(LINKDEF);\ echo "/LIBPATH:../lib/w32" >> $(LINKDEF);\ echo "kernel32.lib" >> $(LINKDEF);\ + echo "advapi32.lib" >> $(LINKDEF);\ echo "ole32.lib" >> $(LINKDEF);\ echo "micasacache.lib" >> $(LINKDEF);\ echo "/DLL" >> $(LINKDEF);\ echo "/OUT:$(BINDIR)$(basename $(notdir $@)).dll" >> $(LINKDEF);\ echo "/MAP:$(BINDIR)$(basename $(notdir $@)).map" >> $(LINKDEF);\ - echo "/DEBUG" >> $(LINKDEF);\ + echo "/PDB:$(BINDIR)$(basename $(notdir $@)).pdb" >> $(LINKDEF);\ echo "/MACHINE:IX86" >> $(LINKDEF);\ echo "/SUBSYSTEM:WINDOWS" >> $(LINKDEF);\ echo "/INCREMENTAL:NO" >> $(LINKDEF);\ echo "/VERSION:$(BLD_VER)" >> $(LINKDEF);\ echo "/FIXED:NO" >> $(LINKDEF);\ - echo "/NODEFAULTLIB:uuid" >> $(LINKDEF);\ echo "/NODEFAULTLIB:libc" >> $(LINKDEF);\ echo "/NODEFAULTLIB:oldnames" >> $(LINKDEF);\ - echo "/NODEFAULTLIB:user32" >> $(LINKDEF);\ - echo "/NODEFAULTLIB:gdi32" >> $(LINKDEF);\ - echo "/NODEFAULTLIB:comdlg32" >> $(LINKDEF);\ - echo "/NODEFAULTLIB:winspool" >> $(LINKDEF);\ - echo "/NODEFAULTLIB:shell32" >> $(LINKDEF);\ echo "/NODEFAULTLIB:comctl32" >> $(LINKDEF);\ echo "/NODEFAULTLIB:olepro32" >> $(LINKDEF);\ - echo "/NODEFAULTLIB:user32" >> $(LINKDEF);\ + echo "/NODEFAULTLIB:oleaut32" >> $(LINKDEF);\ echo "/NODEFAULTLIB:wininet" >> $(LINKDEF);\ + echo "/NODEFAULTLIB:uuid" >> $(LINKDEF);\ + echo "/NODEFAULTLIB:user32" >> $(LINKDEF);\ + echo "/NODEFAULTLIB:libcmtd" >> $(LINKDEF);\ + echo "/NODEFAULTLIB:msvcr71.lib" >> $(LINKDEF);\ echo "/OPT:REF" >> $(LINKDEF);\ echo "/EXPORT:miCASA_CreateSHSHandle" >> $(LINKDEF);\ echo "/EXPORT:miCASA_DestroySHSHandle" >> $(LINKDEF);\ diff --git a/c_test/sdk_sshtst/sshtst.ncb b/c_test/sdk_sshtst/sshtst.ncb index d3938ebc56129471735a95f2583e712ca778d28d..4ee0b1a4ab0eadb3fc5b0530b13a3d89dcb14cc4 100644 GIT binary patch delta 10527 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 delta 10325 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 BpPT>y diff --git a/shsrc/wshsrc/mk-micasacache-ow b/shsrc/wshsrc/mk-micasacache-ow index b4ff2ac8..fa6a69a4 100644 --- a/shsrc/wshsrc/mk-micasacache-ow +++ b/shsrc/wshsrc/mk-micasacache-ow @@ -24,7 +24,7 @@ cd $BR/c_common COMMON_FILES=$(ls) (ln -f $COMMON_FILES $BR/c_micasacache) cd $BR/c_micasacache -($BR/$GNU_I/make -I $BR/make -f makefile ROOT=$PR PLAT=w32 MODULE=client BLD_VER=\"$BLD_NO\" XTRA_CFLAGS="-D\"SSCS_WIN32_PLAT_F\" -D\"N_PLAT_CLIENT\" -MTd -Od -Zi -GZ" XTRA=md $2 $3 $4 $5 $6) +($BR/$GNU_I/make -I $BR/make -f makefile ROOT=$PR PLAT=w32 MODULE=client BLD_VER=\"$BLD_NO\" XTRA_CFLAGS="-D\"SSCS_WIN32_PLAT_F\" -D\"N_PLAT_CLIENT\" -MT -Ox " XTRA=md $2 $3 $4 $5 $6) RCODE=$? rm -f $COMMON_FILES if(test $RCODE != 0) diff --git a/shsrc/wshsrc/mk-micasadk-ow b/shsrc/wshsrc/mk-micasadk-ow index adf79ee8..860dd3a3 100644 --- a/shsrc/wshsrc/mk-micasadk-ow +++ b/shsrc/wshsrc/mk-micasadk-ow @@ -24,7 +24,7 @@ cd $BR/c_common COMMON_FILES=$(ls) (ln -f $COMMON_FILES $BR/c_micasadk) cd $BR/c_micasadk -($BR/$GNU_I/make -I $BR/make -f makefile ROOT=$PR PLAT=w32 MODULE=client BLD_VER=\"$BLD_NO\" XTRA_CFLAGS="-D\"N_PLAT_CLIENT\" -MD -Od -Z7" XTRA=md $2 $3 $4 $5 $6) +($BR/$GNU_I/make -I $BR/make -f makefile ROOT=$PR PLAT=w32 MODULE=client BLD_VER=\"$BLD_NO\" XTRA_CFLAGS="-D\"N_PLAT_CLIENT\" -MT -Ox " XTRA=md $2 $3 $4 $5 $6) RCODE=$? rm -f $COMMON_FILES if(test $RCODE != 0) diff --git a/vs_solutions/CASAInstall/CASA.ncb b/vs_solutions/CASAInstall/CASA.ncb index 42b4e4883bd08fffb88cef019c8f85bf4ceebb93..c79edc0eb400d5152fd5c03d60fa3904503654f0 100644 GIT binary patch delta 19989 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 delta 16457 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 delta 1938 zcmcIkZA@EL7=F*~rKN+7Qo8X~D3b}S0)tWtqfFXDF^dJ!MV2hvw1Xiv;F`e{Hnd&h z4?_H4ygGG$A^4GKOt#%0&Y=q~!OTRL7=E}V#>~a|(*`|HmO!T>8dwZrN~p}vA4hm0fQC@&blQ(u(RY11b4 zpd4H!BSKra_9*0PV+ok;B>dS?8o{kRou0u{un>d^x+Eui4gGiRKED-}S?BkfKx85i!Z5 z)+3@)`^}muvToneVsomqpohO*UyAJJ*lV+Eaog`g38ia?Hyk%|P0>%>UF_sDO_}^$ zQ@0i`p3f+j=eLp{0s3ht4hkd4D1wy9FP3n#tT?Jx5?h2&kk=lkUCe5Z+VzIW3)ta3K$hkh-ctYrF99zD$AMRYcY)V{6Ts`h z8^D{uTfp1EH1G~E1Iz+)KZ*A-{y@%8J=h~odje{MUYA~&h;r#`L!V&{5hSCKUTs*% zz1Pjt&DYJcer8p!gL(wtTN%n9qiVF>$-ajkp~vVDxY^B*I&;&iQKKRLtYb4r?P`9~ zvr@NVowre{W}nyRlS^p~?FcCKfZPUhqxq>3Jl0T9A6KDohtC6BBbo<(>GeRX^WO7< zm6n(R5%HismoMg5@Iprk&bDEk8B3LujBV+-MhZagjpRzA3fsA`sS8`zqO}1_$2Gtz zk6UW(Sl>YPz*ekr(bJ%%)>Y@0G_E!5QFIzB6iUiIcNHELx+HjFd+4529$O*!2-Nfh zMAD_Je2AW+1K_KdI`|9QHvTc&Ar&9e8HVy?>~)B%9t3%G>SQ!21-<*93)(Mu-L6o^ zErEc<@>o5%D<{0$Nebys%89}OeC-Mo|Js10zQ7W$j&#L z0>B!c@Orq*XJ@6SeD)pP0tssC4A%L<@v`hUry z$oTMl^O4(n?cB#d@MKF3?`z%5zqA=MN99pcAgO&==AZ( X1LHHD>dbaA^ROA#vqC!?Zdd*SN3E+S diff --git a/vs_solutions/CASAInstall/CASA.vdproj b/vs_solutions/CASAInstall/CASA.vdproj index 76974b71..86cea2b9 100644 --- a/vs_solutions/CASAInstall/CASA.vdproj +++ b/vs_solutions/CASAInstall/CASA.vdproj @@ -13,6 +13,12 @@ "SccProvider" = "8:" "Hierarchy" { + "Entry" + { + "MsmKey" = "8:_0532B715CB414B478EF7F1C249E501E8" + "OwnerKey" = "8:_8A1A4BA980A9443DBCD4DE4ACDA8F19A" + "MsmSig" = "8:_UNDEFINED" + } "Entry" { "MsmKey" = "8:_1759661D2FDA4F2E95C0E7FC36CFA63C" @@ -21,6 +27,12 @@ } "Entry" { + "MsmKey" = "8:_88EF6178AF974BB3BA6BDD14F8FE5A23" + "OwnerKey" = "8:_D1641051214046F78EDF37DC13C414ED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_8A1A4BA980A9443DBCD4DE4ACDA8F19A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -33,18 +45,6 @@ } "Entry" { - "MsmKey" = "8:_B7B1DB5DD09B4D36B2A8C353C94A7297" - "OwnerKey" = "8:_8A1A4BA980A9443DBCD4DE4ACDA8F19A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_B7B1DB5DD09B4D36B2A8C353C94A7297" - "OwnerKey" = "8:_D1641051214046F78EDF37DC13C414ED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_D1641051214046F78EDF37DC13C414ED" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -250,13 +250,13 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:CASA" - "ProductCode" = "8:{57440238-DFAE-411E-906D-B73B7183B07F}" - "PackageCode" = "8:{EED56817-5E66-4562-AECB-DB0A43716A8D}" + "ProductCode" = "8:{B5628252-6539-4F60-943B-974088A26847}" + "PackageCode" = "8:{92C4EA00-0131-44CA-81A8-7CC0A258E667}" "UpgradeCode" = "8:{DFD8B8A0-EA51-4202-831C-7CD2B90A63AE}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" - "ProductVersion" = "8:1.5.132" + "ProductVersion" = "8:1.5.146" "Manufacturer" = "8:Novell" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" @@ -730,16 +730,24 @@ } "MergeModule" { - "{35A69C6E-5BA4-440D-803D-762B59A45393}:_B7B1DB5DD09B4D36B2A8C353C94A7297" + "{35A69C6E-5BA4-440D-803D-762B59A45393}:_0532B715CB414B478EF7F1C249E501E8" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" "SourcePath" = "8:dotnetfxredist_x86.msm" - "Properties" - { - } - "LanguageId" = "3:1033" - "Exclude" = "11:TRUE" + "LanguageId" = "3:0" + "Exclude" = "11:FALSE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } + "{35A69C6E-5BA4-440D-803D-762B59A45393}:_88EF6178AF974BB3BA6BDD14F8FE5A23" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:TRUE" + "SourcePath" = "8:dotnetfxredist_x86.msm" + "LanguageId" = "3:0" + "Exclude" = "11:FALSE" "Folder" = "8:" "Feature" = "8:" "IsolateTo" = "8:" diff --git a/vs_solutions/CASAManager/CASAManager.suo b/vs_solutions/CASAManager/CASAManager.suo index df30ed7a7a25167828f798eb0f440e0b9f3e1cf1..01f4a0522482264060522b93a518f997648c72df 100644 GIT binary patch delta 1305 zcmaJ=OH30{6uoacl>(g>Y51g8ptQxd{0b5SNN@-Xweiym0p(-F6oUqkkV5z@7z`UX zs9bj@E?6jv8sIJ58Sxil;s@PnVuEo=A~7sb6Y71fKoe8%B#c5kdMem znF0!JECh0o;Iiz*bBfG2^a0r*G(v=yx%fcJaUDzH&lSduF+=Pfby_zCqRQmBNV`I` z`KaKC*>5z^G9}KYH`B((f0|!Q3i~%&dcY`(+%iN{ge?=2r02gZerA-(m>L%j!x^#s zX>m%vp0TQD`*CH@S!U&`Z9-=>ky&IGfkjZho*UFz8=wn1pdb36fxbQT?S@Wbjh3M5 zu%qS}$|!;mR6`rRJE0fCaFK}Js5qOk-#LkCULzaCh;uMCo80Q5jsn%;r0a)hE{QMZ z&BqF!NxK^wMva~tz|~W4~}e9k96@F|7kYuH!L(}NjpbzB`OiCnjFb* zDc)~_B$|{=a|R^@H;y-znl;j2C5YdW1kKG^_^qjp{tFXVn;p!veMJR{a>NFtfCl6- b)}IOQRJAXW2ikpZ&Q3)bYE>E?PfPj(N1$~h delta 1196 zcmaJ=T}YE*6h7~_Pu=wUHgitrPnm9tGk=!}u2C~dNHjN;NoL}3ra_tb6ZiwI5Q^^H z@gfK!b|FC+<$KXxY*-m#7e)|7NZmviK{tb}3)gw)UyRoIIDGGW&hwo2`ObU3z-tzG z!Jdpt>Q*ckI|KkW@~wG~Q7)wgE=c7(EVJoG`f+@ge%Zf;?*a zp2Ak}OF*DX^f2l&AO zy)a5qA6%jLWf(-&+MRKUc0L$_K^RA$bv{@+nQ@rtBXAY25hP&k!L`yw9w>`QIAhCm znB%p5FdnbtBj7fBjN&sQ*$ho|NE39y7^S9YHA)Y_6fW2*(`Z3f8$4yfPc|>QDqQ%^ zV#Yfa!*waZ80AEV0diqYb5TQg5{sE65KR$w`}nN(fpba@HyNB4*V>s))m)I`$D5Pkgjxym(bYW{w7c0Ndh924VszvF)HB4E z>&-I1+w+ZKB&Q0i93Qcxw$b$VQGM2r=Sv%c|CoH0JR8?lqgl+YaD`mhE)ow^Hjoy= z#SO!bCS=b0C3_n4l4;}-X9e5G`&(z2dV) zhji&wFPl6cZ+L4AKdB?>5Vx>ZBnd)#Ia`K z&XwL@Ah?#$S-5fG2ZHXzKcKEfacdVD&zrbXx)R^zytyCm-gnNMPNUQ4mJHQ$KZw;s)v*c8lK@ zn$k+m%1SEkeM~(wlgrp-=^B}@vAhx}AQ8+%C$=-iP%IQM`-SdB{HcC delta 616 zcmZwFOG_J37zW_)%p{XApvic}Nhpz0(5Uf(V1;14uUxcu1zWT*HDiQ25g}_u?&tFgdBp3RaZW6ifTRw^IsC`