Age | Commit message (Collapse) | Author |
|
Change-Id: I41a0633cc6ebe2db8ad662132d727fb2ec3282ab
|
|
The Viewer app is intended to eventually resemble the experimental
Android DocumentLoader app.
Build using the gbuild mechanism, which is also invoked from an Xcode
project. This seems to work out fine, the resulting app installs at
least on the simulator, and you can debug all the LO code involved
even if Xcode (obviously) has no knowledge of the LO source
files/classes/etc.
Change-Id: Ic96178d80b8d6467cac969b29e37f0d39513acf9
|
|
Sure, but this was wrong.
This reverts commit e795b4d80dec9eb1e9b63daa4e31c03d8d68f220.
|
|
Change-Id: Icef3b0276b1560efd4bb14f59bf44f997b0a5221
|
|
Change-Id: I953fb203b1a24920f236c2f6e1fd9d82edda1f0f
Reviewed-on: https://gerrit.libreoffice.org/1493
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
|
|
Change-Id: Ica89dc89663ed3fa611e36245732b296386b5bf7
|
|
Change-Id: Ia6c96d3db5c232cb393832c1dd4e33295827bb99
|
|
Change-Id: I7127db6aad9e97a0f3e758aa83b22ac8465d3f43
|
|
Change-Id: Ia8b83e69401dccd37c3350e381093af1dd5b17af
|
|
The idea is to get rid of GUIBASE and GUI checks as much as possible.
GUIBASE=aqua <=> OS=MACOSX
GUIBASE=WIN <=> OS=WNT
GUIBASE=cocoatouch <=> OS=IOS
GUIBASE=android <=> OS=ANDROID
Don't set GUIBASE to these values any more in configure.ac
either.
GUIBASE_FOR_BUILD is not used anywhere.
Conflicts:
configure.ac
postprocess/packcomponents/makefile.mk
postprocess/packregistry/makefile.mk
Change-Id: Ie0526b40e1073f2328ba6c333e28752104b0fed3
|
|
Change-Id: Iaec5e0fd53d340f028e271f28e99a73dedc636f7
|
|
since 4e7f9650e2a32b648cbd50ab113955920f960354
Change-Id: I7745a59bdd5986552a476f73c2b5a4d10b277726
|
|
SUSE has no interest in it any longer, and I doubt anybody else has
either.
|
|
Change-Id: Ica4b621a7ae7e5ab447192ae3fe7b8911295bef2
Reviewed-on: https://gerrit.libreoffice.org/1232
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
Change-Id: Icacd44abfa5bf5f75f0ee719b39fba6821976a8a
|
|
Patches contributed by Armin Le-Grand
#118898# Adapted ImpGraphic::ImplGetBitmap to correctly convert metafiles...
http://svn.apache.org/viewvc?view=revision&revision=1293316
#118485# - Styles for OLEs are not saved.
http://svn.apache.org/viewvc?view=revision&revision=1182166
Patches contributed by Andre Fischer
http://svn.apache.org/viewvc?view=revision&revision=1172128
http://svn.apache.org/viewvc?view=revision&revision=1172133
Patch contributed by Ariel Constenla-Haile
i#118505# - Remove MN_OLE_OBJECT menu item from Draw/Impress
contextmenu - CWS contextmenu1
http://svn.apache.org/viewvc?view=revision&revision=1182915
Patch contributed by Zhang Jian Fang
#118876#, Add check if the OutlinerParaObject is created successfully
http://svn.apache.org/viewvc?view=revision&revision=1243381
restore a re-based rdbedit.
|
|
Change-Id: I8210957cedf911418044da340642cf97396f3e14
|
|
No need for dirty hacks linking in basegfx objects statically any more.
To avoid unnecessary confusion between the newly plain code and any instance of
the old extension still installed (per-user or shared), I renamed all relevant
UNO implementation identifiers from com.sun.star.comp.documents.* to
org.libreoffice.comp.documents.*. Also, existing installations of the extension
are explicitly not migrated to new user profiles.
The xpdfimport executable is now in program/, its xpdfimport_err.pdf in
share/xpdfimport/. To simplify finding the _err.pdf from xpdfimport, its full
pathname is now given as additional second argument to xpdfimport. To find
xpdfimport executable from CppunitTest, CppunitTest creates a symlink from
solver's unittest/installation/program to solver's bin, so that
"$BRAND_BASE_DIR/program/xpdfimport" works there (as CppunitTest now sets
BRAND_BASE_DIR to solver's unittest/installation).
The sdext/source/pdfipmort/dialogs/ Basic stuff appeared to be unused (even
though it was included in the .oxt) and has been removed.
The --disable-ext-pdfimport configure switch is renamed to --disable-pdfimport.
Having it still conditional requires some pdf_Portable_Document_Format vs.
pdf_Portable_Document_Format_import foo in module filter.
Change-Id: Iee58c2f6187142a418decc9ea3a5df10eb7e0523
|
|
The immediate trigger was 5e5c11c664f67ff9fd1120905b09a32bea3b2f6c "fdo#42070
Fix RTL support in presenter console" causing build failures on Mac OS X when
linking the extension against vcl, but there should be more benefits of going
from a bundled-anyway extension to plain code. (Not the least to get rid of the
com.sun.star.drawing.XPresenterHelper hack.)
To avoid unnecessary confusion between the newly plain code and any instance of
the old extension still installed (per-user or shared), I renamed all relevant
identifiers as follows:
* UNO implementation com.sun.star.comp.Draw.framework.PresenterScreenJob ->
org.libreoffice.comp.PresenterScreenJob
* UNO implementation com.sun.star.sdext.presenter.PresenterProtocolHandler ->
org.libreoffice.comp.PresenterScreenProtocolHandler
* protocol handler schema vnd.com.sun.star.comp.PresenterScreen ->
vnd.org.libreoffice.presenterscreen
* configuration schema /org.openoffice.Office.extension.PresenterScreen ->
/org.openoffice.Office.PresenterScreen (it appears this contains little to no
user-changeable data anyway, so not migrating it to a new user profile due to
the schema name change should not be problematic)
* job ID onDocumentOpenedJob -> org.libreoffice.PresenterScreen
Even with these precautions, having the presenter screen installed both as plain
code and as a (per-user or shared) extension still leads to a crash when
activating presentation mode (likely due to how both codes want to take control
of the screen). To mitigate this, existing installations of the extension are
explicitly not migrated to new user profiles.
The sdext/source/presenter/bitmaps/*.png files were moved to
icon-themes/galaxy/sd/res/presenterscreen-*.png and are now accessed via SdResId
(adding the relevant data to sd/source/ui/inc/res_bmp.hrc and
sd/source/ui/app/res_bmp.src; not sure whether these locations are already
ideal).
The code itself has been left mostly unchanged in sdext/source/presenter/, and
it still clumsily communicates with sd core code via XPresenterHelper. There is
a lot of room for improvement here.
The help data is left untouched at sdext/source/presenter/help/ and needs to
be incorporated properly into helpcontent2 in a follow-up commit.
The --disable-ext-presenter-console configure switch is gone.
Change-Id: I71adb7ae6dcdbd1802151fce6e3871d8a2026332
|
|
Conflicts:
desktop/prj/build.lst
helpcontent2
l10ntools/Executable_gsicheck.mk
l10ntools/Executable_uiex.mk
regexp/inc/regexp/reclass.hxx
solenv/gbuild/AllLangResTarget.mk
Change-Id: I398f0cd9e7daefa8d2e04fd977d5bc2e9708169b
|
|
This is a rework of f9059d4eee8e53c0a6b531fff16e1fade58cb8b0 "Key all browser
plugin features to --enable-nsplugin." The problem with that was that Mac OS X
supports pluging browser plugins into LO documents (which was originally
controlled by --enable-mozilla) but not plugging LO into browser windows (which
was originally controlled by --enable-nsplugin), so controlling the former with
the same switch as the latter did not actually work.
Thus I replaced the single ENABLE_NSPLUGIN feature flag with two dedicated ones,
ENABLE_NPAPI_FROM_BROWSER (for plugging browser plugins into LO documents) and
ENABLE_NPAPI_INTO_BROWSER (for plugging LO into browser windows). The
--enable-nsplugin configure switch is gone completely, setting the feature flags
is always done fully automatically now.
Change-Id: Iecf706637465e865c987563b5de489fa90b4c904
|
|
...instead of having them spread across --enable-nsplugin (plug LO into browser
windows) and --enable-mozilla (plug browser plugins into LO documents). The
ultimate goal is to clean up the various configure options mentioning "mozilla"
and WITH_MOZILLA.
Change-Id: I6f4b1c3a5701424f586cc1e303af90c9d59a91b6
|
|
|
|
Conflicts:
Repository.mk
RepositoryFixes.mk
connectivity/prj/build.lst
extensions/prj/build.lst
filter/prj/build.lst
fpicker/prj/build.lst
l10ntools/StaticLibrary_transex.mk
saxon/build.xml
shell/prj/build.lst
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/Configuration.mk
solenv/gbuild/UI.mk
ucb/source/ucp/webdav/webdavcontent.cxx
|
|
- partial implementation of the SessionInstaller interfaces
- accessable via service:
org.freedesktop.PackageKit.SyncDbusSessionHelper
Change-Id: Ica91f481d041a066215fba3e808bf587e1271f1b
|
|
Now with librsvg no longer used, and liblangtag no longer using glib,
a bunch of bundled (in some configurations, always on some platforms)
3rd-party libraries are no longer needed.
Initial work by rene, continued by tml.
Change-Id: I76edd7aea5452e3487499f0b9ed9f767cf760194
|
|
linecap: Reintegrating finished LineCap feature
Patch contributed by Regina Henschel
http://svn.apache.org/viewvc?view=revision&revision=1232507
Patches contributed by Sven Jacobi
impress212: #i81610# fixed animation export
http://svn.apache.org/viewvc?view=revision&revision=1167620
impress212: drawinglayer gbuild environment changes
http://svn.apache.org/viewvc?view=revision&revision=1167627
http://svn.apache.org/viewvc?view=revision&revision=1167628
impress212: DffPropSet -> minor code improvements, removing table
http://svn.apache.org/viewvc?view=revision&revision=1167634
impress212: #158494# fixed excel import (text rotation)
http://svn.apache.org/viewvc?view=revision&revision=1167638
Patches contributed by Armin Le Grand
Svg: Reintegrated Svg replacement from /branches/alg/svgreplavement
http://svn.apache.org/viewvc?view=revision&revision=1220836
#118728# changed indentifying definitions for Svg file detection
http://svn.apache.org/viewvc?view=revision&revision=1229961
#118838# LineGeometry creation for complicated cases optimized to
create single Polygons
http://svn.apache.org/viewvc?view=revision&revision=1236232
#119176# corrected file type detection for SVG for svg files
without xml header
http://svn.apache.org/viewvc?view=revision&revision=1309445
#118728# Extended Svg file detection
http://svn.apache.org/viewvc?view=revision&revision=1230531
#118529# solve break converters and convert commands for OLEs and images
http://svn.apache.org/viewvc?view=revision&revision=1186168
svg: added WaE changes from branch svgreplacement to trunc
http://svn.apache.org/viewvc?view=revision&revision=1222974
svg: corrected missing member initialization
http://svn.apache.org/viewvc?view=revision&revision=1226134
fix for #118525#: Using primitives for chart sub-geometry visualisation
http://svn.apache.org/viewvc?view=revision&revision=1226879
#118898# Adapted ImpGraphic::ImplGetBitmap to correctly convert
metafiles to bitmapEx ...
http://svn.apache.org/viewvc?view=revision&revision=1293316
fix for #118525#: removed no longer used variable maOriginalMapMode, one
more exception eliminated
http://svn.apache.org/viewvc?view=revision&revision=1227097
#16758# Added buffering to the VDev usages of the VclProcessor2D derivates...
http://svn.apache.org/viewvc?view=revision&revision=1229521
#116758# Secured VDev buffer device to Vcl deinit
http://svn.apache.org/viewvc?view=revision&revision=1230574
#116758# added remembering allocated VDevs for VDevBuffer to be able to also
delete these when vcl goes down; it should never happen, but You never know
http://svn.apache.org/viewvc?view=revision&revision=1230927
#118730# Changed SvgClipPathNode to use MaskPrimitive2D for primitive
representation instead of TransparencePrimitive2D
http://svn.apache.org/viewvc?view=revision&revision=1231198
#118822# secured 3D geometry creation (slices) by subdividing the 2D
source polyPolygon early
http://svn.apache.org/viewvc?view=revision&revision=1234749
#118829# enhanced Svg gradient quality, obstacles avoided
http://svn.apache.org/viewvc?view=revision&revision=1235361
#118834# Unified usage of TextBreakupHelper as single tooling class
for i18n text primitive breakup
http://svn.apache.org/viewvc?view=revision&revision=1236110
#118853# added square pixel size limit to conversion of
TransparencePrimitive2D to Metafile action
http://svn.apache.org/viewvc?view=revision&revision=1237656
#118824# coreccted mirroring and boundrect when the graphicmanager
is used for bitmap output
http://svn.apache.org/viewvc?view=revision&revision=1240097
#115092# Corrected VclProcessor2D::RenderPolygonStrokePrimitive2D for
various optimization scenarios
http://svn.apache.org/viewvc?view=revision&revision=1241434
#118783# Corrected errors in ID strings, corrected Svg line/fill export,
corrected polygon close state
http://svn.apache.org/viewvc?view=revision&revision=1232006
#118796# corrected null-pointer usage in SVG text exporter
http://svn.apache.org/viewvc?view=revision&revision=1240262
#118729# Use GraphicStreamUrl and GraphicUrl to allow multi image
import with linked graphics, too
http://svn.apache.org/viewvc?view=revision&revision=1229962
#118898# corrected error in GDIMetaFile::GetBoundRect in handling
MetaFloatTransparentAction
http://svn.apache.org/viewvc?view=revision&revision=1293349
#118855# Corrected handling of possibly created empty clipRegions
after PolyPolygon clipping
http://svn.apache.org/viewvc?view=revision&revision=1237725
#115962# Better (but not yet optimal, see comments in task) handling
of MetaFloatTransparentAction in PDF export
http://svn.apache.org/viewvc?view=revision&revision=1241078
IP clearance: #118466# This patch removes librsvg, libcroco, libgsf, ...
http://svn.apache.org/viewvc?view=revision&revision=1200879
118779# Added svg content streaming in/out to ImpGraphic stream operators
http://svn.apache.org/viewvc?view=revision&revision=1231908
linecap: correctons for WaE and mac drawing
http://svn.apache.org/viewvc?view=revision&revision=1232793
svg: uses current system Dpi for Svg replacement image creation
http://svn.apache.org/viewvc?view=revision&revision=1233948
Patches contributed by Mathias Bauer (and others)
gnumake4 work variously
http://svn.apache.org/viewvc?view=revision&revision=1394326
http://svn.apache.org/viewvc?view=revision&revision=1396797
http://svn.apache.org/viewvc?view=revision&revision=1397315
http://svn.apache.org/viewvc?view=revision&revision=1394326
Remove duplicate header includes.
cws mba34issues01: #i117720#: convert assertion into warning
http://svn.apache.org/viewvc?view=revision&revision=1172352
118485 - Styles for OLEs are not saved. Submitted by Armin Le Grand.
http://svn.apache.org/viewvc?view=revision&revision=1182166
cws mba34issues01: #i117714#: remove assertion
http://svn.apache.org/viewvc?view=revision&revision=1172357
Patch contributed by Jurgen Schmidt
add some additional checks to ensure proper reading operations
http://svn.apache.org/viewvc?view=revision&revision=1209022
mostly prefer our stream / bounds checking work.
Patches contributed by Herbert Duerr
#i118816# add clarifying comment regarding Font::*Color*() methods
http://svn.apache.org/viewvc?view=revision&revision=1233833
extend macro->string handling for empty strings
http://svn.apache.org/viewvc?view=revision&revision=1175801
avoid magic constants for SALCOLOR_NONE
http://svn.apache.org/viewvc?view=revision&revision=1177543
initialize slant properly in ImplFontMetricData constructor (author=iorsh)
http://svn.apache.org/viewvc?view=revision&revision=1177551
#i118675# make check for extension updates more stable
http://svn.apache.org/viewvc?view=revision&revision=1214797
#a118617# remove VBasicEventListener.dll binary
There are no known users depending on its CLSID
http://svn.apache.org/viewvc?view=revision&revision=1203697
Patches contributed by Ariel Constenla-Haile
Fix build breaker on Linux/gcc
http://svn.apache.org/viewvc?view=revision&revision=1221104
Fix crash when trying to instantiate css.graphic.GraphicRasterizer_RSVG
http://svn.apache.org/viewvc?view=revision&revision=1215559
Patches contributed by Oliver-Rainer Wittmann
sw34bf06: #i117962# - method <SwFlyFrm::IsPaint(..)> - consider
instances of <SwFlyDrawObj>
http://svn.apache.org/viewvc?view=revision&revision=1172120
sw34bf06: #i117783# - Writer's implementation of XPagePrintable -
apply print settings to new printing routines
http://svn.apache.org/viewvc?view=revision&revision=1172115
gnumake4 work variously from Hans-Joachim Lankenau
http://svn.apache.org/viewvc?view=revision&revision=1397315
http://svn.apache.org/viewvc?view=revision&revision=1396797
http://svn.apache.org/viewvc?view=revision&revision=1396782
http://svn.apache.org/viewvc?view=revision&revision=1394707
plus some amount of re-splitting of legacy headers.
Patch contributed by Pavel Janik
WaE: Remove unused variables.
http://svn.apache.org/viewvc?view=revision&revision=1230697
Patches contributed by Takashi Ono
mingwport35: i#117795: MinGW port fix for vcl2gnumake
http://svn.apache.org/viewvc?view=revision&revision=1172091
mingwport35: i#117795: MinGW port fix for vcl2gnumake
http://svn.apache.org/viewvc?view=revision&revision=1172091
Patch contributed by Christian Lippka
impress212: #i98044# re enable Text menu for outline and title shapes
http://svn.apache.org/viewvc?view=revision&revision=1167639
Patch contributed by Andre Fischer
118674: Made category B code optional and disabled by default.
http://svn.apache.org/viewvc?view=revision&revision=1215131
118881: Ignore empty paragraphs after bullets.
http://svn.apache.org/viewvc?view=revision&revision=1296205
Patches contributed by Philipp Lohmann
ooo340fixes: #i117780# use rtl allocator
http://svn.apache.org/viewvc?view=revision&revision=1172087
ooo34gsl02: #i117807# fix an off by one error (index actually
inside the pfb section header)
http://svn.apache.org/viewvc?view=revision&revision=1167576
various cleanups, related compilation fixes, warning cleanups, re-working
of obsolete stl template pieces to use boost instead, changed string
classes, re-adapt KDE about data, about dialog, fixing warnings,
and other fixes & improvements.
Disable svg import / render for about/ branding code-paths for now.
Restore full icon theme set.
Remove OS/2 conditionals and sources.
Remove conflicting gtk/full-screen monitors support.
Retain existing svg rasterizer files - temporarily disabled.
Standardize stringificaiton and fixup dllpostfix issues.
Rename SvgGradientHelper::== to equalTo to avoid overloading issues.
Use the flat GdiPlus API for LineCaps calls.
|
|
I tried to ask all developers hacking writerfilter, and seems none of us
use this at all.
Change-Id: I46e59c49c47ec829e5e84cb814e515bf2e8cdafb
|
|
Which localize and update help tree files
instead of update_tree.pl.
Use it to update extensions' help.
Next step: use it with general help.
Change-Id: Ife9696bdd8b973ef3cf30626533e38720408179b
|
|
It turns out that the native library cannot be renamed after creation.
The right name must be used from the beginning, otherwise
publishing is failing with the follow error (gacutil -i):
"Failure adding assembly to the cache: Invalid file or assembly name.
The name of the file must be the name of the assembly plus .dll or .exe."
To rectify that create the native lib as cli_cppuhelper.dll,
rename the signed assembly to assembly/cli_cppuhelper.dll and
teach scp2 to pick up the right one: assembly/cli_cppuhelper.dll
(and not cli_cppuhelper.dll).
Change-Id: I2073b617cd440865ae4ab838bb801329f2b07194
|
|
Change-Id: I3a31c7c9ff66e2b6a13b22dce85854777b66355e
|
|
Change-Id: I9c6b670a2df8b1d3a868d91737fcf93e7d40bcb4
|
|
...by folding the contents of java_accessibility.jar back into
java_uno_accessbridge.jar.
In the old build system there were two jars, java_uno_accessbridge.jar
containing the handful of org.openoffice.accessibility classes and all
org.openoffice.java.accessibility classes (though how the latter got included
was fairly obscure in the makefile.mk) and unused java_accessibility.jar that
contained all org.openoffice.java.accessibility classes. When adapting this to
gbuild, the unused java_accessibility.jar was carried over, but all its
org.openoffice.accessibility classes were inadvertently droped from
java_uno_accessbridge.jar.
Change-Id: I9b582ba22667b1dae635828e85c4cc5b530353ac
|
|
Change-Id: I313afb391562adae4f91c55480a036c228e0b540
|
|
Conflicts:
Makefile.top
Module_tail_build.mk
RepositoryExternal.mk
RepositoryFixes.mk
accessibility/source/standard/vclxaccessibletoolbox.cxx
basic/source/uno/dlgcont.cxx
connectivity/Library_ado.mk
cross_tail_build/prj/build.lst
desktop/source/offacc/acceptor.cxx
filter/Library_PptImporter.mk
filter/source/t602/filterenv.cxx
i18npool/Library_textconv_dict.mk
ooo.lst.in
saxon/ExternalProject_saxon.mk
saxon/build.xml
sc/sdi/scalc.sdi
sc/source/filter/xml/xmlstyli.cxx
sc/source/ui/condformat/condformatdlg.cxx
sc/source/ui/condformat/condformatmgr.cxx
sc/source/ui/view/cellsh1.cxx
sdext/source/pdfimport/misc/pwdinteract.cxx
shell/qa/zip/makefile.mk
shell/qa/zip/testimpl/makefile.mk
solenv/gbuild/CppunitTest.mk
solenv/gbuild/gbuild.mk
solenv/gbuild/platform/android.mk
solenv/gbuild/platform/com_GCC_defs.mk
solenv/gbuild/platform/macosx.mk
soltools/Executable_adjustvisibility.mk
soltools/Executable_checkdll.mk
soltools/Executable_cpp.mk
soltools/Executable_javadep.mk
soltools/Executable_makedepend.mk
sw/qa/extras/rtfimport/rtfimport.cxx
tail_build/prj/build.lst
tomcat/ExternalProject_tomcat.mk
ucb/source/ucp/webdav/webdavcontent.cxx
xml2cmp/Executable_xml2cmp.mk
|
|
Change-Id: I1f84f85abc4e2db3679e64d34671458779ca97fa
|
|
Change-Id: I652ac46aec72a92667995353efa637f0a2310672
|
|
Changes:
-Use same methods and commandline params
as other localizers
-Work with one lang during mergeing
-Work well with comments
-Correct makefiles according to one lang concept
Plus delete propex.bat to avoid conflicts
Change-Id: Ia9d2886db263c31f29692c3f6da2b8ec6542b564
|
|
Change-Id: Idba65371b8778521bc767fe4893340cf13a8ff3b
|
|
Change-Id: I87c8d46d791525e3e5b6866edc6423e92cbcca81
|
|
Change-Id: I8dc776d6d96dbe022908418b64dc130d619753c4
|
|
Change-Id: I8f1f5756ac777cefed52ae72af65931bfa14d580
|
|
The following tools are considered to be obsolete and are discontinued:
ldump, giparser, testhxx and support.
Change-Id: I70813c046edb30546463cda9eb8a1b96c3e840a3
|
|
Change-Id: I8f1f5756ac777cefed52ae72af65931bfa14d580
|
|
The following tools are considered to be obsolete and are discontinued:
ldump, giparser, testhxx and support.
Change-Id: I70813c046edb30546463cda9eb8a1b96c3e840a3
|
|
Conflicts:
l10ntools/Module_l10ntools.mk
l10ntools/source/merge.cxx
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/ExtensionTarget.mk
solenv/gbuild/InstallModuleTarget.mk
solenv/gbuild/TargetLocations.mk
|
|
Change-Id: Icd45e901ea9dd664fcbc0db0c71f555c4cc24a34
|
|
|
|
Change-Id: Ic322d1be23033049fa3b5cd60c00479bb6cae3ca
|
|
Change-Id: I66e76da71dd5d6ed1b899aba8d41dfb5bc36da1c
|