From 71ed01e2edb27d09104a412425d5b99247efa4d4 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 6 Mar 2014 20:17:48 +0100 Subject: Revert "install:module s must be mutually exclusive" This reverts commit 768ea2924680fc4beb75a782cb0faf26695fee53, which was completely misguided---configmgr allows oor:external values to let a "lower" value shine through when the backend says it cannot produce a value, even when that "lower" value comes from the same layer (as is e.g. already used in officecfg/registry/data/org/openoffice/VCL.xcu). Conflicts: postprocess/CustomTarget_registry.mk Change-Id: Ic8f0c9c931e2c73c9bfb8fbe5a57f60ad6aebde1 --- officecfg/Configuration_officecfg.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'officecfg/Configuration_officecfg.mk') diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index 497fc27e12ab..d0a72398f30b 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/officecfg/Configuration_officecfg.mk @@ -101,7 +101,6 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat org/openoffice/Office/Paths-macosx.xcu \ org/openoffice/Office/Paths-unxwnt.xcu \ org/openoffice/Office/Paths-unixdesktop.xcu \ - org/openoffice/Office/Paths-notunixdesktop.xcu \ org/openoffice/Office/Paths-internallibexttextcatdata.xcu \ org/openoffice/Office/Paths-externallibexttextcatdata.xcu \ org/openoffice/Office/Writer-cjk.xcu \ -- cgit