Commit graph

1 commit

Author SHA1 Message Date
Don Lewis
02d7e03e42 Add a security patch taken from Apache OpenOffice 4.1.4.
Add a LICENSE entry for MPL10.  Code containing both MPL10 and MPL11
licenses is bundled.

Add CONFLICTS_INSTALL.

Move --with-ant-home and -with-jdk-home to Makefile from Makefile.knobs.

MFH:		2017Q4
Security:	27229c67-b8ff-11e7-9f79-ac9e174be3af
2017-10-26 18:38:56 +00:00