From d0993d263a6d03c26e0dde71ed3f02f71321dc4e Mon Sep 17 00:00:00 2001 From: "Oleg.Korshul" Date: Thu, 7 May 2015 13:15:50 +0000 Subject: [PATCH] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=BD=D0=B0=D0=B1=D0=BE=D1=80=20=D1=81=D0=BA=D1=80?= =?UTF-8?q?=D0=B8=D0=BF=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62422 954022d7-b5bf-4e40-9824-e11837661b57 --- DoctRenderer/COMMON/Joiner/Program.cs | 1 + DoctRenderer/COMMON/JoinerPPT/Program.cs | 51 ++- .../COMMON/JoinerPPT/bin/Debug/Joiner.exe | Bin 13824 -> 14336 bytes DoctRenderer/COMMON/JoinerXLS/Program.cs | 301 +++++++++--------- .../COMMON/JoinerXLS/bin/Debug/Joiner.exe | Bin 15872 -> 16384 bytes 5 files changed, 185 insertions(+), 168 deletions(-) diff --git a/DoctRenderer/COMMON/Joiner/Program.cs b/DoctRenderer/COMMON/Joiner/Program.cs index dcce14afd4..ed14e8a1e9 100644 --- a/DoctRenderer/COMMON/Joiner/Program.cs +++ b/DoctRenderer/COMMON/Joiner/Program.cs @@ -106,6 +106,7 @@ namespace Joiner "Word/Editor/ParagraphContentBase.js", "Word/Editor/ParagraphContent.js", "Word/Editor/Hyperlink.js", + "Word/Editor/Field.js", "Word/Editor/Run.js", "Word/Editor/Math.js", "Word/Editor/Paragraph.js", diff --git a/DoctRenderer/COMMON/JoinerPPT/Program.cs b/DoctRenderer/COMMON/JoinerPPT/Program.cs index a6ce7ec784..4cea72e5fe 100644 --- a/DoctRenderer/COMMON/JoinerPPT/Program.cs +++ b/DoctRenderer/COMMON/JoinerPPT/Program.cs @@ -27,7 +27,7 @@ namespace Joiner "Common/FontsFreeType/font_engine.js", "Common/FontsFreeType/FontFile.js", "Common/FontsFreeType/FontManager.js", - "Common/AllFonts.js", + "Common/FontsFreeType/font_map.js", "Word/Drawing/Externals.js", "Word/Drawing/GlobalLoaders.js", "Common/commonDefines.js", @@ -46,13 +46,14 @@ namespace Joiner "Common/Charts/ChartsDrawer.js", "Common/Charts/DrawingArea.js", "Common/NumFormat.js", - "Word/Editor/Search.js", "Word/Editor/Serialize2.js", "Common/trackFile.js", + "Word/Editor/Styles.js", "Word/Editor/Numbering.js", "Word/Drawing/Metafile.js", "PowerPoint/Editor/CollaborativeEditing.js", + "Word/Drawing/GraphicsEvents.js", "Word/Drawing/WorkEvents.js", "Word/Drawing/Controls.js", @@ -61,6 +62,7 @@ namespace Joiner "Word/Editor/Common.js", "Word/Editor/Sections.js", "Common/scroll.js", + "Word/Editor/History.js", "Common/Drawings/Hit.js", "Common/Drawings/States.js", @@ -72,25 +74,32 @@ namespace Joiner "Common/Drawings/TrackObjects/PolyLine.js", "Common/Drawings/TrackObjects/Spline.js", "Common/Drawings/TrackObjects/MoveTracks.js", + "Word/Drawing/HatchPattern.js", "Word/Drawing/Graphics.js", + "Word/Drawing/Private/Graphics.js", "Word/Drawing/Overlay.js", "Word/Drawing/ShapeDrawer.js", "PowerPoint/Drawing/Transitions.js", "PowerPoint/Drawing/DrawingDocument.js", "PowerPoint/Drawing/HtmlPage.js", + "PowerPoint/apiDefines.js", + "Common/Drawings/Format/Constants.js", + "Common/Shapes/Serialize.js", "Common/Shapes/SerializeWriter.js", "Word/Editor/SerializeCommon.js", + "Common/Drawings/Math.js", "Common/Drawings/ArcTo.js", "Word/Drawing/ColorArray.js", + "PowerPoint/Editor/Format/Presentation.js", "Common/Drawings/CommonController.js", "Excel/view/DrawingObjectsController.js", "PowerPoint/Editor/DrawingObjectsController.js", - "Common/Drawings/Format/Constants.js", + "Common/Drawings/Format/Format.js", "Common/Drawings/Format/CreateGeometry.js", "Common/Drawings/Format/Geometry.js", @@ -105,6 +114,15 @@ namespace Joiner "PowerPoint/Editor/Format/SlideMaster.js", "PowerPoint/Editor/Format/Layout.js", "PowerPoint/Editor/Format/Comments.js", + + "Word/Editor/Styles.js", + "Word/Editor/Numbering.js", + "Word/Editor/ParagraphContent.js", + "Word/Editor/ParagraphContentBase.js", + "Word/Editor/Hyperlink.js", + "Word/Editor/Field.js", + "Word/Editor/Run.js", + "Word/Math/mathTypes.js", "Word/Math/mathText.js", "Word/Math/mathContent.js", @@ -118,12 +136,7 @@ namespace Joiner "Word/Math/operators.js", "Word/Math/accent.js", "Word/Math/borderBox.js", - "Word/Editor/Styles.js", - "Word/Editor/Numbering.js", - "Word/Editor/ParagraphContent.js", - "Word/Editor/ParagraphContentBase.js", - "Word/Editor/Run.js", - "Word/Editor/Hyperlink.js", + "Word/Editor/FlowObjects.js", "Word/Editor/Paragraph.js", "Word/Editor/Paragraph_Recalculate.js", @@ -133,19 +146,31 @@ namespace Joiner "Word/Editor/Table.js", "Word/Editor/Math.js", "Word/Editor/Spelling.js", + "Word/Editor/Search.js", "Word/Editor/FontClassification.js", + "PowerPoint/Editor/Format/ShapePrototype.js", "PowerPoint/Editor/Format/ImagePrototype.js", "PowerPoint/Editor/Format/GroupPrototype.js", "PowerPoint/Editor/Format/ChartSpacePrototype.js", "PowerPoint/Editor/Format/GraphicFrame.js", + + "Excel/utils/utils.js", + "Excel/model/Serialize.js", + "Excel/model/WorkbookElems.js", + "Excel/model/Workbook.js", + "Excel/model/CellInfo.js", + "Excel/model/AdvancedOptions.js", - "PowerPoint/apiDefines.js", - "PowerPoint/api.js", - "PowerPoint/apiCommon.js", + "Common/Private/Locks.js", "Common/Shapes/EditorSettings.js", - "PowerPoint/themes/Themes.js" + "PowerPoint/themes/Themes.js", + "PowerPoint/apiDefines.js", + "Common/commonDefines.js", + + "PowerPoint/api.js", + "PowerPoint/apiCommon.js" }; if (true) diff --git a/DoctRenderer/COMMON/JoinerPPT/bin/Debug/Joiner.exe b/DoctRenderer/COMMON/JoinerPPT/bin/Debug/Joiner.exe index b9623b708c02fb6cf737551e1a06871e03ee7f61..699062dd68b85d46b4e0177cf410d08eef147726 100644 GIT binary patch delta 2100 zcma*od2AF_90%~<4BfWdYrEYZY};jb+wDc~atjExEl}IKh0Ch|%NLR}SjQ%L>SUw$bL9j% zM4D{NGg53WDie)*guWtDwCJ@q-%D~pjO&%gagF*vblN?*sIUmP6})!%_3)TC2DPkM z9A(8}k`<2`Rsx(0RKkHuRw53toVdtJ!W_$GV0DCwB%_Cwg43*2%&^knvZ=a-Sj}>y zkCl!wRtCOiWnzxyL0+WFF2XR&i%Ve{cCQb!-06ouN)=`y$jZhMRsf%{a_}817k62C z$ca|jd^E8NaDufM*I9*FYgcte7_*aMExxxHx4E+f!5B4Mig8vMW?AK^iB+Q&Fjz}4 z$y$m#tYyfKQ+3O+owWjISS#@xYZZ)wcvbiawzF2_Bi0(su+}0YLDfBqR@OR=QVC8@dw zw6UJR1S^O;tVXPGsk+TL!P~O2(q5WFlz@USkGXZ^(_82m^+b^s={q(VC}*Hs~uyk4t&Y##4Kw!($Z9R4{BI@ zG0fVB3D$nxWpyEMp-LFt=w$ZH@A+Pw=Dt3B!|KNz>j3<26$Uz41Gvl@gfm@@4q*@L zAg;0w!JVN-52MPGA(#IMhPd-NTwo33N7nOjWU9zfG_a20D9ga-O1_YMqk(s`@3__A z7n$z`t1-uAFIo+^Cp=?(s!QyRYS(K$Vk*k72R-6e)Jly+esp#E+a99q<|g_gn_F8{ozIEqh8@nbi4occgXqc z<(%#E5e7tgK}h_Zzg0{Y)FuA;&U?SS`D>u&-4@^7@vHdVj9a{3E583V*X2GqAW}@^@Jl(@D#|QGco)sy9=MPHARB S$zL}8>>AU#bXFTJi~0w500{2@ delta 1632 zcmX}seN3B090%~bXDe+flomQ*l=1WhTA(ij95AO2aNS0Mz4GSfX2F7pz`!qKZvN9P z(Kts8l8eD6{-asKbTM&xg2X6^Z!!9(L0y&@QM3I)bTczqrX*%wx!<@am*;bL-`~^b za=G&p=SSbX=sW)Ii7rO%SEg|rw=fo#6Y`a5yW3_z=&}D9XY5dB*vHrvljx7SY>ef| zajRS?6<#eYj`3i2tXfWaWDko=JjA2oV;%obHqiF#5M zlB8nPe_jpB#H{v2M3TK4dPYOb66w|;Wp`c=tZhx7{jC&kS2}b zIw>`}alXfpSFB1-p^-F>A<_h{l3oPgs&YUtX%ZijP9wKOtxh39I)ho#OIRSC#jT9Y za{JGr!Y!7~Bic!~XtsE@q+28{JHY`M&8j)-08r zdklZ}O;cIL9yZR#AZW8Hoo9HOCi=To8BJQvmcGpOj z@o7l|7xj60;-Ky`x=N?Bj8%WRCRThG#aI4-81mQgdeP@9HUfb;Zmb6X;o`2lPArAG z#NNx5j9=nMWSp`kMT+ugN|juknEpV@Eq9ijZ*%c^w9l~DteLdtU52ya JFFspi{vRX-pm_iQ diff --git a/DoctRenderer/COMMON/JoinerXLS/Program.cs b/DoctRenderer/COMMON/JoinerXLS/Program.cs index 111f3ce0c2..fb1965bdcb 100644 --- a/DoctRenderer/COMMON/JoinerXLS/Program.cs +++ b/DoctRenderer/COMMON/JoinerXLS/Program.cs @@ -200,163 +200,154 @@ namespace Joiner }; */ string[] arrFilesConfig = { - "Common/Build/License.js", - "Common/browser.js", - "Common/docscoapisettings.js", - "Common/docscoapicommon.js", - "Common/docscoapi.js", - "Common/downloaderfiles.js", - "Common/apiCommon.js", - "Common/commonDefines.js", - "Common/editorscommon.js", - "Common/NumFormat.js", - "Common/Charts/charts.js", - "Common/Charts/DrawingArea.js", - "Common/Charts/DrawingObjects.js", - "Common/Charts/ChartsDrawer.js", - "Common/FontsFreeType/font_engine.js", - "Common/FontsFreeType/FontFile.js", - "Common/FontsFreeType/FontManager.js", - "Word/Drawing/HatchPattern.js", - "Word/Drawing/WorkEvents.js", - "Word/Drawing/Externals.js", - "Word/Drawing/Metafile.js", - "Excel/model/DrawingObjects/GlobalLoaders.js", - "Common/trackFile.js", - "Excel/apiDefines.js", - "Excel/document/empty-workbook.js", - "Excel/utils/utils.js", - "Excel/model/clipboard.js", - "Excel/model/autofilters.js", - "Excel/graphics/DrawingContext.js", - "Excel/graphics/pdfprinter.js", - "Excel/model/CollaborativeEditing.js", - "Excel/model/ConditionalFormatting.js", - "Excel/model/FormulaObjects/parserFormula.js", - "Excel/model/FormulaObjects/dateandtimeFunctions.js", - "Excel/model/FormulaObjects/engineeringFunctions.js", - "Excel/model/FormulaObjects/cubeFunctions.js", - "Excel/model/FormulaObjects/databaseFunctions.js", - "Excel/model/FormulaObjects/textanddataFunctions.js", - "Excel/model/FormulaObjects/statisticalFunctions.js", - "Excel/model/FormulaObjects/financialFunctions.js", - "Excel/model/FormulaObjects/mathematicFunctions.js", - "Excel/model/FormulaObjects/lookupandreferenceFunctions.js", - "Excel/model/FormulaObjects/informationFunctions.js", - "Excel/model/FormulaObjects/logicalFunctions.js", - "Excel/model/Serialize.js", - "Excel/model/WorkbookElems.js", - "Excel/model/Workbook.js", - "Excel/model/CellInfo.js", - "Excel/model/AdvancedOptions.js", - "Excel/model/History.js", - "Excel/model/UndoRedo.js", - "Excel/model/CellComment.js", - "Excel/view/mobileTouch.js", - "Excel/view/iscroll.js", - "Excel/view/PopUpSelector.js", - "Excel/view/StringRender.js", - "Excel/view/CellTextRender.js", - "Excel/view/CellEditorView.js", - "Excel/view/WorksheetView.js", - "Excel/view/HandlerList.js", - "Excel/view/EventsController.js", - "Excel/view/WorkbookView.js", - "Common/scroll.js", - "Word/Editor/SerializeCommon.js", - "Common/Drawings/Math.js", - "Common/Drawings/ArcTo.js", - "Word/Drawing/ColorArray.js", - "Common/Shapes/Serialize.js", - "Common/Shapes/SerializeWriter.js", - "Common/SerializeCommonWordExcel.js", - "Common/SerializeChart.js", - - "Common/Drawings/Hit.js", - "Common/Drawings/States.js", - "Common/Drawings/DrawingObjectsHandlers.js", - "Common/Drawings/TrackObjects/AdjustmentTracks.js", - "Common/Drawings/TrackObjects/ResizeTracks.js", - "Common/Drawings/TrackObjects/RotateTracks.js", - "Common/Drawings/TrackObjects/NewShapeTracks.js", - "Common/Drawings/TrackObjects/PolyLine.js", - "Common/Drawings/TrackObjects/Spline.js", - "Common/Drawings/TrackObjects/MoveTracks.js", - - - "Common/Drawings/CommonController.js", - "Common/Drawings/Format/Constants.js", - "Common/Drawings/Format/Format.js", - "Common/Drawings/Format/CreateGeometry.js", - "Common/Drawings/Format/Geometry.js", - "Common/Drawings/Format/Path.js", - "Common/Drawings/Format/Shape.js", - "Common/Drawings/Format/GroupShape.js", - "Common/Drawings/Format/Image.js", - "Common/Drawings/Format/ChartSpace.js", - "Common/Drawings/Format/ChartFormat.js", - "Common/Drawings/Format/TextBody.js", - "Common/wordcopypaste.js", - "Excel/view/DrawingObjectsController.js", - - "Excel/model/DrawingObjects/Graphics.js", - "Excel/model/DrawingObjects/Overlay.js", - "Excel/model/DrawingObjects/Controls.js", - "Excel/model/DrawingObjects/ShapeDrawer.js", - - - - "Excel/model/DrawingObjects/DrawingDocument.js", - - "Excel/model/DrawingObjects/Format/ShapePrototype.js", - "Excel/model/DrawingObjects/Format/ImagePrototype.js", - "Excel/model/DrawingObjects/Format/GroupPrototype.js", - "Excel/model/DrawingObjects/Format/ChartSpacePrototype.js", - - - "Word/Editor/Comments.js", - "Word/Editor/Styles.js", - "Word/Editor/FlowObjects.js", - "Word/Editor/ParagraphContent.js", - "Word/Editor/ParagraphContentBase.js", - "Word/Editor/Hyperlink.js", - "Word/Editor/Run.js", - "Word/Editor/Math.js", - "Word/Editor/Paragraph.js", - "Word/Editor/Paragraph_Recalculate.js", - "Word/Editor/Sections.js", - "Word/Editor/Numbering.js", - "Word/Editor/HeaderFooter.js", - "Word/Editor/Document.js", - "Word/Editor/DocumentContent.js", - "Word/Editor/Table.js", - "Word/Editor/Serialize2.js", - "Word/Editor/FontClassification.js", - "Word/Editor/Spelling.js", - "Word/Editor/GraphicObjects/WrapManager.js", - - "Word/Math/mathTypes.js", - "Word/Math/mathText.js", - "Word/Math/mathContent.js", - "Word/Math/base.js", - "Word/Math/fraction.js", - "Word/Math/degree.js", - "Word/Math/matrix.js", - "Word/Math/limit.js", - "Word/Math/nary.js", - "Word/Math/radical.js", - "Word/Math/operators.js", - "Word/Math/accent.js", - "Word/Math/borderBox.js", - - "Excel/model/DrawingObjects/GlobalCounters.js", - - "Word/apiCommon.js", + "Common/Build/License.js", + "Common/browser.js", + "Common/docscoapisettings.js", + "Common/docscoapicommon.js", + "Common/docscoapi.js", + "Common/downloaderfiles.js", + "Common/apiCommon.js", + "Common/commonDefines.js", + "Common/editorscommon.js", + "Common/NumFormat.js", + "Common/Charts/charts.js", + "Common/Charts/DrawingArea.js", + "Common/Charts/DrawingObjects.js", + "Common/Charts/ChartsDrawer.js", + "Common/FontsFreeType/font_engine.js", + "Common/FontsFreeType/FontFile.js", + "Common/FontsFreeType/FontManager.js", + "Common/FontsFreeType/font_map.js", + "Word/Drawing/HatchPattern.js", + "Word/Drawing/WorkEvents.js", + "Word/Drawing/Externals.js", + "Word/Drawing/Metafile.js", + "Excel/model/DrawingObjects/GlobalLoaders.js", + "Common/trackFile.js", + "Excel/apiDefines.js", + "Excel/document/empty-workbook.js", + "Excel/utils/utils.js", + "Excel/model/clipboard.js", + "Excel/model/autofilters.js", + "Excel/graphics/DrawingContext.js", + "Excel/graphics/pdfprinter.js", + "Excel/model/CollaborativeEditing.js", + "Excel/model/ConditionalFormatting.js", + "Excel/model/FormulaObjects/parserFormula.js", + "Excel/model/FormulaObjects/dateandtimeFunctions.js", + "Excel/model/FormulaObjects/engineeringFunctions.js", + "Excel/model/FormulaObjects/cubeFunctions.js", + "Excel/model/FormulaObjects/databaseFunctions.js", + "Excel/model/FormulaObjects/textanddataFunctions.js", + "Excel/model/FormulaObjects/statisticalFunctions.js", + "Excel/model/FormulaObjects/financialFunctions.js", + "Excel/model/FormulaObjects/mathematicFunctions.js", + "Excel/model/FormulaObjects/lookupandreferenceFunctions.js", + "Excel/model/FormulaObjects/informationFunctions.js", + "Excel/model/FormulaObjects/logicalFunctions.js", + "Excel/model/Serialize.js", + "Excel/model/WorkbookElems.js", + "Excel/model/Workbook.js", + "Excel/model/CellInfo.js", + "Excel/model/AdvancedOptions.js", + "Excel/model/History.js", + "Excel/model/UndoRedo.js", + "Excel/model/CellComment.js", + "Excel/model/Private/CellComment.js", + "Excel/view/mobileTouch.js", + "Excel/view/iscroll.js", + "Excel/view/PopUpSelector.js", + "Excel/view/StringRender.js", + "Excel/view/CellTextRender.js", + "Excel/view/CellEditorView.js", + "Excel/view/WorksheetView.js", + "Excel/view/Private/WorksheetView.js", + "Excel/view/HandlerList.js", + "Excel/view/EventsController.js", + "Excel/view/WorkbookView.js", + "Common/scroll.js", + "Word/Editor/SerializeCommon.js", + "Common/Drawings/Math.js", + "Common/Drawings/ArcTo.js", + "Word/Drawing/ColorArray.js", + "Common/Shapes/Serialize.js", + "Common/Shapes/SerializeWriter.js", + "Common/SerializeCommonWordExcel.js", + "Common/SerializeChart.js", + "Common/Drawings/Hit.js", + "Common/Drawings/States.js", + "Common/Drawings/DrawingObjectsHandlers.js", + "Common/Drawings/TrackObjects/AdjustmentTracks.js", + "Common/Drawings/TrackObjects/ResizeTracks.js", + "Common/Drawings/TrackObjects/RotateTracks.js", + "Common/Drawings/TrackObjects/NewShapeTracks.js", + "Common/Drawings/TrackObjects/PolyLine.js", + "Common/Drawings/TrackObjects/Spline.js", + "Common/Drawings/TrackObjects/MoveTracks.js", + "Common/Drawings/CommonController.js", + "Common/Drawings/Format/Constants.js", + "Common/Drawings/Format/Format.js", + "Common/Drawings/Format/CreateGeometry.js", + "Common/Drawings/Format/Geometry.js", + "Common/Drawings/Format/Path.js", + "Common/Drawings/Format/Shape.js", + "Common/Drawings/Format/GroupShape.js", + "Common/Drawings/Format/Image.js", + "Common/Drawings/Format/ChartSpace.js", + "Common/Drawings/Format/ChartFormat.js", + "Common/Drawings/Format/TextBody.js", + "Common/wordcopypaste.js", + "Excel/view/DrawingObjectsController.js", + "Excel/model/DrawingObjects/Graphics.js", + "Excel/model/DrawingObjects/Private/Graphics.js", + "Excel/model/DrawingObjects/Overlay.js", + "Excel/model/DrawingObjects/Controls.js", + "Excel/model/DrawingObjects/ShapeDrawer.js", + "Excel/model/DrawingObjects/DrawingDocument.js", + "Excel/model/DrawingObjects/Format/ShapePrototype.js", + "Excel/model/DrawingObjects/Format/ImagePrototype.js", + "Excel/model/DrawingObjects/Format/GroupPrototype.js", + "Excel/model/DrawingObjects/Format/ChartSpacePrototype.js", + "PowerPoint/Editor/Format/GraphicFrame.js", + "Word/Editor/Comments.js", + "Word/Editor/Styles.js", + "Word/Editor/FlowObjects.js", + "Word/Editor/ParagraphContent.js", + "Word/Editor/ParagraphContentBase.js", + "Word/Editor/Hyperlink.js", + "Word/Editor/Field.js", + "Word/Editor/Run.js", + "Word/Editor/Math.js", + "Word/Editor/Paragraph.js", + "Word/Editor/Paragraph_Recalculate.js", + "Word/Editor/Sections.js", + "Word/Editor/Numbering.js", + "Word/Editor/HeaderFooter.js", + "Word/Editor/Document.js", + "Word/Editor/DocumentContent.js", + "Word/Editor/Table.js", + "Word/Editor/Serialize2.js", + "Word/Editor/FontClassification.js", + "Word/Editor/Spelling.js", + "Word/Editor/GraphicObjects/WrapManager.js", + "Word/Math/mathTypes.js", + "Word/Math/mathText.js", + "Word/Math/mathContent.js", + "Word/Math/base.js", + "Word/Math/fraction.js", + "Word/Math/degree.js", + "Word/Math/matrix.js", + "Word/Math/limit.js", + "Word/Math/nary.js", + "Word/Math/radical.js", + "Word/Math/operators.js", + "Word/Math/accent.js", + "Word/Math/borderBox.js", + "Excel/model/DrawingObjects/GlobalCounters.js", + "Word/apiCommon.js", "Excel/api.js", - "Common/Shapes/EditorSettings.js", - "Common/commonDefines.js", - "Excel/apiDefines.js" + "Common/Shapes/EditorSettings.js" }; if (true) diff --git a/DoctRenderer/COMMON/JoinerXLS/bin/Debug/Joiner.exe b/DoctRenderer/COMMON/JoinerXLS/bin/Debug/Joiner.exe index fa4d976a06ac35ccc2f8fd3ac3f1b145ae146de0..89c5a6435e0df21240b54c061fe3d497a1130a15 100644 GIT binary patch delta 1904 zcmZA2TTB#J7zgk(0}H!cWkK$+yX@MPo1!dRE#8p36kLSGT8n~!x*(VSp`b0gAhjyg z7J6bZ^}*2Ev@!6|Oxi?yOXCx@wwgZMk{Cj4($cgsO>Ieg4(IEOlT7CK|Gw{>%*-Y` zBf}#j+T?|-{k9rEqho>TTBK%X%qt4wB9ETNsT)l(_D05PWNcyVBh!>4K5B%qD3OO7 z7)$34J&zyI+z|sFQL>BE%g41`Z43WYb89>Jk6M=9Cw7oWl{j@~Vl8g5Fpn`!WO0V^ z8BYQC>7m*a?$>KH&S&&n!Jk4{-+OTuTRc)il@hR*v=(EeM0`R@LbOTEC8LOxf@V@G zu94C(PfEw%qzr5dQ)@HPuN1V|Fh@l@9+Mo{8LkGiFimn|h2%n;S#{UpGtx6iv#6RI zqonm%B4wjGLUnU6N6LjGlJy1Uv*+Qwpj18G zg$K2yB8-u|m?u4p719=D2V>Ndt!O1ZhiOtV?vu75GFHuPM=5CsCP+K+6=@e%NF^v- zqgL#OpHvD?D#LA3upEzx708WKODfSys>1uEYCIzCL7G*~)u5X6JWi8pai3I&!gw{e z7nevrERpI_o*=qG@zVEUT2iP1i=;*ruT?ca#z;-LL)wq%MAdx(he-$U0qI3NBprk^ zNzJ{4Zc;PmNQdxeQc$%IqcmBm1s6%JxJf#K@D$Z;gP+t6gVce4Nk>tes^*SihIAY& zqyRe7RJRj%NnJq{rK{ozd`RlXU!)#nXQ*y3{G>iikY2_e5)hxM=K4`i8bB}U6DYy)M(&6wb-;2Zc9eNXk+>oR^`L!UY++C|s0*Qy7=wCWQ$Z9#D8w zhH$6a?Gj_<3`LaQlC5S6Z_6-2VN!-g3R5yzTxy4RWN^Cp5p$Q`=HlO*9eTjUe>a~= zz3yVn>2F~7au{19rks`j>N0U%$T7w(>ou*(Fd}xF`6F8_|J<6+>#Px`Zq~~Bj9;v? z7Ok8wBqT@s7+8P}it+&KFixevt7(<|yY$4T8p|2KTC`?9>GnR=xb2P!sjBy}UN*!! z#9mSX)+2V?C?33BctBJjQpM_3-hk{?iki3;c3e!fiJnZ|{6U`6_&KLgT8(1gnXKWq+EkD`t=B0*N8Oxl%aq^o$a^;t^d+rsN3=JABn|EpX|9=N{@fze0 zc}0BKt`sr0uc53V_MfG1x91$KxOL8MYQK7LHk98j?2oCUFPa!;hZ=dECsp?~8l9f& Y8ZXf8MvV7~N$>L*aod))se8`v z4j3q-IYeWkQM@ExvQI}1lOPhKCK_XmSqw3F`J{voilhY5U znT*UFJAXQm-Mek4;Ptc6WRWZoqRT2+5BoY7&Az*skebXX;yb$1zO$HM_O;o%HIXY?8ihzU3n8s+ z-Fe1%u-(|M<;c&CxE7I9#zpNT{rd$X`Fe%J>qJS8k_&xQB~sKvd_}o2PgS8NS8Y^d zi1OeRRf8F-7IRb`R^+LTMMx;=UN1}*efXF1Bc87Y1Gr4p!(X6ki;<=paGhF$kVADF z@fNid`Gu<1gap-$pQvRRC=yBCe)krc9_FCyGkc zMi=_1l^CUhxJY&5I<*RAdZ}9JL6};N6Vw`9rq*JPT8Gv$wXq(9cN<2jyYU6J z9hENC-GPKH-TKj^FjM#uIQG7-n!7VBYXPw%33X>;R^K(Zc$@!`_!C{u#zuheQt1=VcZTcF&wwUHHH&* zxT!NeYo{{*?X!FncIad{X@?<(Q+7DZaM}(g!=xR4VK`%lH34dNAtzj`1HQIt6Eg3bp1mBcq>8ihTweuZj#rip!ZO{J?@eQO6