diff options
| author | Dennis Francis <dennis.francis@collabora.com> | 2020-01-11 11:48:42 +0530 |
|---|---|---|
| committer | Dennis Francis <dennis.francis@collabora.com> | 2020-01-13 12:09:28 +0100 |
| commit | d98cc8f881673f64f0a1fa35eea8610fb5b083e3 (patch) | |
| tree | a951a60ac4946f260710b10c411c83f0ff757da4 /comphelper/Library_comphelper.mk | |
| parent | solenv/flatpak-manifest.in: Merge "remove dconf access" (diff) | |
| download | core-d98cc8f881673f64f0a1fa35eea8610fb5b083e3.tar.gz core-d98cc8f881673f64f0a1fa35eea8610fb5b083e3.zip | |
Revert "tdf#125662: disable parallel-zip if the memory..."
This reverts commit 0b8ae8725083eb0526a262d434cc06fb3f3e7336.
A better fix will follow this patch.
Change-Id: I4ff8d71bf2401bae2e2071c369e3746b8b7c72bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86595
Tested-by: Jenkins
Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
Diffstat (limited to 'comphelper/Library_comphelper.mk')
| -rw-r--r-- | comphelper/Library_comphelper.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk index b5de3f58b36a..e0bf1a8574f5 100644 --- a/comphelper/Library_comphelper.mk +++ b/comphelper/Library_comphelper.mk @@ -117,7 +117,6 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\ comphelper/source/misc/listenernotification \ comphelper/source/misc/logging \ comphelper/source/misc/lok \ - comphelper/source/misc/meminfo \ comphelper/source/misc/mimeconfighelper \ comphelper/source/misc/namedvaluecollection \ comphelper/source/misc/numberedcollection \ |