[
https://issues.apache.org/jira/browse/ODFTOOLKIT-319?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13405445#comment-13405445
]
Rob Weir commented on ODFTOOLKIT-319:
-------------------------------------
Are you getting an error? a Conflict?
I'm using TortoiseSVN on Windows, with their merge util. The patches apply
cleanly with that.
If you are getting problems, maybe check out the same revision as out 0.5
release, apply the patch and then merge to trunk?
> Document encryption support
> ---------------------------
>
> Key: ODFTOOLKIT-319
> URL: https://issues.apache.org/jira/browse/ODFTOOLKIT-319
> Project: ODF Toolkit
> Issue Type: Improvement
> Components: odfdom, simple api
> Reporter: Rob Weir
> Labels: patch
> Attachments: security-odfdom.patch, security-simple.patch
>
>
> Two patches, one for ODFDOM and one for Simple API. Unit tests included.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators:
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
